summaryrefslogtreecommitdiff
path: root/sql-common
diff options
context:
space:
mode:
authorunknown <msvensson@shellback.(none)>2006-10-12 11:57:50 +0200
committerunknown <msvensson@shellback.(none)>2006-10-12 11:57:50 +0200
commit6b328fc4a6ae57987ca2f2773132f899d0700db9 (patch)
tree3c2364ee7df1b87ab051b707622ab09a8e318ff9 /sql-common
parent131d8b8645f0f5628cd62f5c0b1a3457f9f63307 (diff)
parent450eab19a3fd61603d18df4516e991ea18d08076 (diff)
downloadmariadb-git-6b328fc4a6ae57987ca2f2773132f899d0700db9.tar.gz
Merge bk-internal:/home/bk/mysql-5.1-maint
into shellback.(none):/home/msvensson/mysql/mysql-5.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 79a5be938b2..b6947028e74 100644
--- a/sql-common/client.c
+++ b/sql-common/client.c
@@ -2364,6 +2364,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)