diff options
author | unknown <jimw@mysql.com> | 2005-03-16 17:13:45 -0800 |
---|---|---|
committer | unknown <jimw@mysql.com> | 2005-03-16 17:13:45 -0800 |
commit | 9045b70f400d1c1ba43dbd5fac7d6179496741cf (patch) | |
tree | 3d55ef18229b234505bb52d974628aed412fffa2 /client/mysqltest.c | |
parent | 7fe43b71b93de2a48486b0a9cf34cded18273356 (diff) | |
download | mariadb-git-9045b70f400d1c1ba43dbd5fac7d6179496741cf.tar.gz |
Fix failure in 'kill' test due to change of default
reconnect setting in mysql client library. (Bug #8866)
client/mysqltest.c:
Make sure reconnect is always set on connections, and
note that there is a test that relies on this
Diffstat (limited to 'client/mysqltest.c')
-rw-r--r-- | client/mysqltest.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/client/mysqltest.c b/client/mysqltest.c index 4050dd7a029..f6f6f469e8c 100644 --- a/client/mysqltest.c +++ b/client/mysqltest.c @@ -1695,7 +1695,11 @@ int safe_connect(MYSQL* con, const char* host, const char* user, } 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; } @@ -1790,6 +1794,12 @@ int connect_n_handle_errors(struct st_query *q, MYSQL* con, const char* host, goto err; } + /* + TODO: change this to 0 in future versions, but the 'kill' test relies on + existing behavior + */ + con->reconnect= 1; + if (record) { if (!q->record_file[0] && !result_file) |