mirror of
https://github.com/MariaDB/server.git
synced 2025-08-07 00:04:31 +03:00
Fix failure in 'kill' test due to change of default
reconnect setting in mysql client library. (Bug #8866)
This commit is contained in:
@@ -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)
|
||||||
|
Reference in New Issue
Block a user