mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-20 07:15:33 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge with 5.1 to get in changes from MySQL 5.1.55

Browse source
This commit is contained in:
Michael Widenius 2011-02-28 19:39:30 +02:00
commit 3358cdd504
1605 changed files with 28760 additions and 44097 deletions
Download patch file Download diff file Expand all files Collapse all files

3
sql-common/client.c
View file

@ -1620,6 +1620,7 @@ mysql_init(MYSQL *mysql)
*/
mysql->reconnect= 0;
DBUG_PRINT("mysql",("mysql: 0x%lx", (long) mysql));
return mysql;
}
@ -3302,6 +3303,8 @@ void mysql_detach_stmt_list(LIST **stmt_list __attribute__((unused)),
void STDCALL mysql_close(MYSQL *mysql)
{
DBUG_ENTER("mysql_close");
DBUG_PRINT("enter", ("mysql: 0x%lx", (long) mysql));
if (mysql) /* Some simple safety */
{
/* If connection is still up, send a QUIT message */