bk commit into 4.1 tree (sasha:1.2466)

[Sasha Pachev]

Below is the list of changes that have just been committed into a local
4.1 repository of sasha. When sasha 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://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2466 05/11/07 15:10:48 sasha@stripped +1 -0
  Merge spachev@stripped:/home/bk/mysql-4.1
  into  asksasha.com:/reiser-data/mysql-dev/mysql-4.1-bug7947

  sql/item_func.cc
    1.259 05/11/07 15:10:42 sasha@stripped +0 -0
    Auto merged

# 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:	sasha
# Host:	mysql.sashanet.com
# Root:	/reiser-data/mysql-dev/mysql-4.1-bug7947/RESYNC

--- 1.258/sql/item_func.cc	2005-11-01 03:59:53 -07:00
+++ 1.259/sql/item_func.cc	2005-11-07 15:10:42 -07:00
@@ -1974,7 +1974,7 @@
     tmp.copy(command, strlen(command), tmp.charset());
     tmp.append(ull->key,ull->key_length);
     tmp.append("\")", 2);
-    Query_log_event qev(current_thd, tmp.ptr(), tmp.length(),1, FALSE);
+    Query_log_event qev(current_thd, tmp.ptr(), tmp.length(),0, FALSE);
     qev.error_code=0; // this query is always safe to run on slave
     mysql_bin_log.write(&qev);
   }