summaryrefslogtreecommitdiff
path: root/sql-common
diff options
context:
space:
mode:
authormsvensson@shellback.(none) <>2006-10-12 18:48:03 +0200
committermsvensson@shellback.(none) <>2006-10-12 18:48:03 +0200
commit1be01ceea83af69268e0905a759e3a2debee8d1c (patch)
tree28e19d6de971f6d736129352929e2c847c1c1b21 /sql-common
parent8c88bb4eaa6ec15c72a8c41c67dd6a98778db69a (diff)
parent2db82814c4654b7e1c83378a01f66c6f97cee262 (diff)
downloadmariadb-git-1be01ceea83af69268e0905a759e3a2debee8d1c.tar.gz
Merge bk-internal:/home/bk/mysql-4.1-maint
into shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
Diffstat (limited to 'sql-common')
-rw-r--r--sql-common/client.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sql-common/client.c b/sql-common/client.c
index ff5f1ef150a..3acd763c054 100644
--- a/sql-common/client.c
+++ b/sql-common/client.c
@@ -2215,6 +2215,8 @@ my_bool mysql_reconnect(MYSQL *mysql)
{
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)