bk commit into 5.0 tree (cmiller:1.2112)

[Chad MILLER]

Below is the list of changes that have just been committed into a local
5.0 repository of cmiller. When cmiller 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.2112 06/05/01 22:50:36 cmiller@zippy.(none) +2 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-5.0
  into  zippy.(none):/home/cmiller/work/mysql/mysql-5.0__bug17667

  sql/sql_parse.cc
    1.542 06/05/01 22:50:28 cmiller@zippy.(none) +0 -0
    Auto merged

  mysys/Makefile.am
    1.69 06/05/01 22:50:27 cmiller@zippy.(none) +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:	cmiller
# Host:	zippy.(none)
# Root:	/home/cmiller/work/mysql/mysql-5.0__bug17667/RESYNC

--- 1.68/mysys/Makefile.am	2006-04-10 09:11:32 -04:00
+++ 1.69/mysys/Makefile.am	2006-05-01 22:50:27 -04:00
@@ -55,6 +55,7 @@
 			charset.c charset-def.c my_bitmap.c my_bit.c md5.c \
 			my_gethostbyname.c rijndael.c my_aes.c sha1.c \
 			my_handler.c my_netware.c my_largepage.c \
+			my_memmem.c \
 			my_windac.c my_access.c base64.c
 EXTRA_DIST =		thr_alarm.c thr_lock.c my_pthread.c my_thr_init.c \
 			thr_mutex.c thr_rwlock.c

--- 1.541/sql/sql_parse.cc	2006-04-28 02:30:43 -04:00
+++ 1.542/sql/sql_parse.cc	2006-05-01 22:50:28 -04:00
@@ -1736,7 +1736,7 @@
     if (alloc_query(thd, packet, packet_length))
       break;					// fatal error is set
     char *packet_end= thd->query + thd->query_length;
-    mysql_log.write(thd,command,"%s",thd->query);
+    mysql_log.write(thd,command, "%.*b", thd->query_length, thd->query);
     DBUG_PRINT("query",("%-.4096s",thd->query));
 
     if (!(specialflag & SPECIAL_NO_PRIOR))