diff options
| author | unknown <msvensson@shellback.(none)> | 2006-10-12 11:30:07 +0200 |
|---|---|---|
| committer | unknown <msvensson@shellback.(none)> | 2006-10-12 11:30:07 +0200 |
| commit | 4d45abc5d2d19abf6a79f585c997381c9346e6af (patch) | |
| tree | 9c61dfec1f4b3f6ab8ce4e33839842043ee2e779 /sql-common | |
| parent | e5c2eda470c81d1d011d082a6d83dca7ed3eb8cc (diff) | |
| parent | 00f420db13751bfe36a1d382e44541896134e5cb (diff) | |
| download | mariadb-git-4d45abc5d2d19abf6a79f585c997381c9346e6af.tar.gz | |
Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
client/mysqltest.c:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/lib/mtr_process.pl:
Auto merged
sql-common/client.c:
Auto merged
Diffstat (limited to 'sql-common')
| -rw-r--r-- | sql-common/client.c | 2 |
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) |