bk commit into 4.1 tree (msvensson:1.2580)

[msvensson]

Below is the list of changes that have just been committed into a local
4.1 repository of msvensson. When msvensson 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@stripped, 2006-10-12 10:27:44+02:00, msvensson@shellback.(none) +1 -0
  Add DBUG_ASSERT to check that mysql is not null when mysql_reconnect is called
  Add DBUG_PRINT to show the value of mysql->reconnect

  sql-common/client.c@stripped, 2006-10-12 10:27:42+02:00, msvensson@shellback.(none) +2 -0
    Add DBUG_ASSERT to check that mysql is not null when mysql_reconnect is called
    Add DBUG_PRINT to show the value of mysql->reconnect

# 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:	msvensson
# Host:	shellback.(none)
# Root:	/home/msvensson/mysql/mysql-4.1-maint

--- 1.93/sql-common/client.c	2006-10-12 10:27:48 +02:00
+++ 1.94/sql-common/client.c	2006-10-12 10:27:48 +02:00
@@ -2215,6 +2215,8 @@
 {
   MYSQL tmp_mysql;
   DBUG_ENTER("mysql_reconnect");
+  DBUG_ASSERT(mysql);
+  DBUG_PRINT("enter", ("mysql->reconnect: %d", mysql->reconnect));
 
   if (!mysql->reconnect ||
       (mysql->server_status & SERVER_STATUS_IN_TRANS) || !mysql->host_info)