diff options
| author | unknown <msvensson@shellback.(none)> | 2006-10-12 11:39:41 +0200 |
|---|---|---|
| committer | unknown <msvensson@shellback.(none)> | 2006-10-12 11:39:41 +0200 |
| commit | 450eab19a3fd61603d18df4516e991ea18d08076 (patch) | |
| tree | 71dea5cdea6e3b6440e5f3aada58848c6ac77741 /sql-common | |
| parent | 1f816053d2f531062c5449fc4cea71c2c41792d6 (diff) | |
| parent | 4d45abc5d2d19abf6a79f585c997381c9346e6af (diff) | |
| download | mariadb-git-450eab19a3fd61603d18df4516e991ea18d08076.tar.gz | |
Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
into shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
client/mysqltest.c:
Auto merged
mysql-test/lib/mtr_process.pl:
Auto merged
sql-common/client.c:
Auto merged
mysql-test/mysql-test-run.pl:
Use remote
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 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) |