diff options
| author | unknown <serg@serg.mylan> | 2006-01-06 18:26:59 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2006-01-06 18:26:59 +0100 |
| commit | e931d813e175630e102bc7b8b60ba4d399c283dd (patch) | |
| tree | afd96a443a293b4718156b7bc9f07c5d45fc01b6 /mysql-test/t/kill.test | |
| parent | 9af5f7f9414603a8db61ef310f26b68ef04a8764 (diff) | |
| parent | f3915a41647978a71aedb209a28f8b61f1dd4cd5 (diff) | |
| download | mariadb-git-e931d813e175630e102bc7b8b60ba4d399c283dd.tar.gz | |
merged
sql/field.cc:
Auto merged
sql/item.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_handler.cc:
ur
Diffstat (limited to 'mysql-test/t/kill.test')
| -rw-r--r-- | mysql-test/t/kill.test | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/mysql-test/t/kill.test b/mysql-test/t/kill.test index 7f3a9932d31..c50c35825fc 100644 --- a/mysql-test/t/kill.test +++ b/mysql-test/t/kill.test @@ -25,11 +25,18 @@ select ((@id := kill_id) - kill_id) from t1; kill @id; connection con1; ---sleep 1 +--sleep 2 -# this statement should fail ---error 2006,2013 +--disable_query_log +--disable_result_log +# One of the following statements should fail +--error 0,2006,2013 select 1; +--error 0,2006,2013 +select 1; +--enable_query_log +--enable_result_log + --enable_reconnect # this should work, and we should have a new connection_id() select ((@id := kill_id) - kill_id) from t1; |