diff options
| author | unknown <jimw@mysql.com> | 2005-04-04 23:03:56 -0700 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-04-04 23:03:56 -0700 |
| commit | 66e6808ed0b31f085eab4187fa835cb1168e8aa9 (patch) | |
| tree | 6ad8acc6094f563caca17989c7e15c8f1d599987 /mysql-test/t/kill.test | |
| parent | 2cb2374b78b8bab2655a3f45d9e4f657c2250336 (diff) | |
| parent | 682baee2316f194108587ce0da4aa44ea1a481ab (diff) | |
| download | mariadb-git-66e6808ed0b31f085eab4187fa835cb1168e8aa9.tar.gz | |
Merge
mysql-test/r/join_outer.result:
Auto merged
mysql-test/t/join_outer.test:
Auto merged
sql-common/client.c:
Auto merged
sql/mysqld.cc:
Auto merged
Diffstat (limited to 'mysql-test/t/kill.test')
| -rw-r--r-- | mysql-test/t/kill.test | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/mysql-test/t/kill.test b/mysql-test/t/kill.test index 8492a2a2f8e..6744a212828 100644 --- a/mysql-test/t/kill.test +++ b/mysql-test/t/kill.test @@ -23,13 +23,15 @@ connection con2; select ((@id := kill_id) - kill_id) from t1; kill @id; -# Wait for thread to do. ---sleep 5 -# verify that con1 is doning a reconnect connection con1; ---ping ---ping -select ((@id := kill_id) - kill_id) from t1; + +--disable_reconnect +# this statement should fail +--error 2006 +select 1; +--enable_reconnect +# this should work, and we should have a new connection_id() +select ((@id := kill_id) - kill_id) from t1; select @id != connection_id(); #make sure the server is still alive |