summaryrefslogtreecommitdiff
path: root/mysql-test/r
diff options
context:
space:
mode:
authorunknown <jimw@mysql.com>2005-03-28 09:59:41 -0800
committerunknown <jimw@mysql.com>2005-03-28 09:59:41 -0800
commit92db4a838f9198ab0924b8b876b5991bfe00e8d9 (patch)
tree78e84e0886e0c93e92557c2a21167ac6e8d2ebd2 /mysql-test/r
parent3785d2188f557bc01be28e7f2480be42ca598ab9 (diff)
downloadmariadb-git-92db4a838f9198ab0924b8b876b5991bfe00e8d9.tar.gz
Fix reconnect when using prepared statements, and add
--disable_reconnect and --enable_reconnect to mysqltest so that it can be tested properly. (Bug #8866) client/mysqltest.c: Add support for --disable_reconnect and --enable_reconnect mysql-test/r/kill.result: Update results mysql-test/t/kill.test: Fix test to actually verify that killing a connection is working, and that automatic reconnect is working as desired. sql-common/client.c: Clean up MYSQL->stmts on reconnect by invalidating statements not in the MYSQL_STMT_INIT_DONE state, and reconnecting others to the new MYSQL object.
Diffstat (limited to 'mysql-test/r')
-rw-r--r--mysql-test/r/kill.result8
1 files changed, 8 insertions, 0 deletions
diff --git a/mysql-test/r/kill.result b/mysql-test/r/kill.result
index 788fab8d31a..dcf17e4bf52 100644
--- a/mysql-test/r/kill.result
+++ b/mysql-test/r/kill.result
@@ -5,6 +5,14 @@ select ((@id := kill_id) - kill_id) from t1;
((@id := kill_id) - kill_id)
0
kill @id;
+select 1;
+ERROR HY000: MySQL server has gone away
+select ((@id := kill_id) - kill_id) from t1;
+((@id := kill_id) - kill_id)
+0
+select @id != connection_id();
+@id != connection_id()
+1
select 4;
4
4