bk commit into 5.1 tree (lars:1.2210)

[Lars Thalmann]

Below is the list of changes that have just been committed into a local
5.1 repository of lthalmann. When lthalmann 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.2210 06/03/23 09:38:17 lars@stripped +2 -0
  Merge mysql.com:/users/lthalmann/bk/mysql-5.0
  into  mysql.com:/users/lthalmann/bk/mysql-5.1-new

  sql-common/client.c
    1.86 06/03/23 09:38:05 lars@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-wait_slave_status.inc
    1.3 06/03/23 09:38:04 lars@stripped +0 -0
    Delete: mysql-test/include/wait_slave_status.inc

# 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:	lars
# Host:	dl145h.mysql.com
# Root:	/users/lthalmann/bk/mysql-5.1-new/RESYNC

--- 1.85/sql-common/client.c	2006-02-25 19:35:09 +01:00
+++ 1.86/sql-common/client.c	2006-03-23 09:38:05 +01:00
@@ -1428,7 +1428,13 @@
     mysql->free_me=1;
   }
   else
-    bzero((char*) (mysql),sizeof(*(mysql)));
+  {
+#if defined(EMBEDDED_LIBRARY) || MYSQL_VERSION_ID >= 50100
+    bzero((char*) (mysql), sizeof(*(mysql)));
+#else
+    bzero((char*) (mysql), offsetof(MYSQL, info_buffer));
+#endif
+  }
   mysql->options.connect_timeout= CONNECT_TIMEOUT;
   mysql->last_used_con= mysql->next_slave= mysql->master = mysql;
   mysql->charset=default_charset_info;
@@ -2341,9 +2347,12 @@
   my_free(mysql->user,MYF(MY_ALLOW_ZERO_PTR));
   my_free(mysql->passwd,MYF(MY_ALLOW_ZERO_PTR));
   my_free(mysql->db,MYF(MY_ALLOW_ZERO_PTR));
+#if defined(EMBEDDED_LIBRARY) || MYSQL_VERSION_ID >= 50100
   my_free(mysql->info_buffer,MYF(MY_ALLOW_ZERO_PTR));
+  mysql->info_buffer= 0;
+#endif
   /* Clear pointers for better safety */
-  mysql->info_buffer=mysql->host_info=mysql->user=mysql->passwd=mysql->db=0;
+  mysql->host_info= mysql->user= mysql->passwd= mysql->db= 0;
 }