summaryrefslogtreecommitdiff
path: root/sql-common
diff options
context:
space:
mode:
authormsvensson@shellback.(none) <>2006-10-12 11:30:07 +0200
committermsvensson@shellback.(none) <>2006-10-12 11:30:07 +0200
commit5741683d1203eafb9fbc6493e2aeacd61a183ada (patch)
tree9c61dfec1f4b3f6ab8ce4e33839842043ee2e779 /sql-common
parent0eb2fff749722a687f5f56a4e22d976ce288c1ed (diff)
parent3c66250e84701be48145412f98ed6bce89e00c2d (diff)
downloadmariadb-git-5741683d1203eafb9fbc6493e2aeacd61a183ada.tar.gz
Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
into shellback.(none):/home/msvensson/mysql/mysql-5.0-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 cfd53fb1012..fc913f3f3cf 100644
--- a/sql-common/client.c
+++ b/sql-common/client.c
@@ -2369,6 +2369,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)