Commit 1055e525 authored by jimw@mysql.com's avatar jimw@mysql.com

Fix failure in 'kill' test due to change of default

reconnect setting in mysql client library. (Bug #8866)
parent d6c893bb
...@@ -1695,7 +1695,11 @@ int safe_connect(MYSQL* con, const char* host, const char* user, ...@@ -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, ...@@ -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)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment