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

Merge mysql.com:/space/my/mysql-5.0-build

Browse source 
into mysql.com:/space/my/mysql-5.0


sql/sql_parse.cc:
  Auto merged
This commit is contained in:
unknown 2005-03-17 21:54:10 +01:00
commit 9cffa82b41
1 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

12
client/mysqltest.c
View file

@ -1695,7 +1695,11 @@ int safe_connect(MYSQL* con, const char* host, const char* user,
} }
sleep(CON_RETRY_SLEEP); sleep(CON_RETRY_SLEEP);
} }
con->reconnect= 1; /* TODO: change this to 0 in future versions */ /*
TODO: change this to 0 in future versions, but the 'kill' test relies on
existing behavior
*/
con->reconnect= 1;
return con_error; return con_error;
} }
@ -1790,6 +1794,12 @@ int connect_n_handle_errors(struct st_query *q, MYSQL* con, const char* host,
goto err; goto err;
} }
/*
TODO: change this to 0 in future versions, but the 'kill' test relies on
existing behavior
*/
con->reconnect= 1;
if (record) if (record)
{ {
if (!q->record_file[0] && !result_file) if (!q->record_file[0] && !result_file)