bk commit into 4.0 tree (1.1688)

Below is the list of changes that have just been committed into a local
4.0 repository of guilhem. When guilhem does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet
  1.1688 03/03/22 15:22:59 guilhem@xxxxxxxxx +1 -0
  Fix for #178  Replicating INSERT VALUES(USER()) crashes (SEGV) the slave
      Now it does not SEGV, but USER() is still badly replicated
      (it is replicated to ""), which is a lower priority bug.

  sql/item_strfunc.cc
    1.55 03/03/22 15:22:57 guilhem@xxxxxxxxx +3 -1
    Fix for #178  Replicating INSERT VALUES(USER()) crashes (SEGV) the slave
    Now it does not SEGV, but USER() is still badly replicated
    (it is replicated to ""), which is a lower priority bug.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: guilhem
# Host: gbichot.local
# Root: /home/mysql_src/mysql-4.0

--- 1.54/sql/item_strfunc.cc    Wed Jan 29 18:12:48 2003
+++ 1.55/sql/item_strfunc.cc    Sat Mar 22 15:22:57 2003
@@ -1373,8 +1373,10 @@
 
 String *Item_func_user::val_str(String *str)
 {
+  // TODO: make USER() replicate properly (currently it is replicated to "")
   THD *thd=current_thd;
-  if (str->copy((const char*) thd->user,(uint) strlen(thd->user)) ||
+  if (!(thd->user) || // for system threads (e.g. replication SQL thread)
+      str->copy((const char*) thd->user,(uint) strlen(thd->user)) ||
       str->append('@') ||
       str->append(thd->host ? thd->host : thd->ip ? thd->ip : ""))
     return &empty_string;

---------------------------------------------------------------------
Before posting, please check:
   http://www.mysql.com/manual.php   (the manual)
   http://lists.mysql.com/           (the list archive)

To request this thread, e-mail internals-thread7646@xxxxxxxxxxxxxxx
To unsubscribe, e-mail <internals-unsubscribe@xxxxxxxxxxxxxxx>