diff options
author | unknown <stewart@mysql.com> | 2005-08-19 00:39:56 +1000 |
---|---|---|
committer | unknown <stewart@mysql.com> | 2005-08-19 00:39:56 +1000 |
commit | b0dee441164b751c6393f08319c063a1a70d0e32 (patch) | |
tree | 00418d060ffeeaebd17a35fa1eb91f2e29961cc6 /mysql-test/t/kill.test | |
parent | f2727ff26a160f981d300edd6cba79e49867db58 (diff) | |
parent | 749f599efa81de151401d0af33c4b31292727b15 (diff) | |
download | mariadb-git-b0dee441164b751c6393f08319c063a1a70d0e32.tar.gz |
merge fix
ndb/src/mgmapi/mgmapi.cpp:
merge
Diffstat (limited to 'mysql-test/t/kill.test')
-rw-r--r-- | mysql-test/t/kill.test | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mysql-test/t/kill.test b/mysql-test/t/kill.test index 37e11e14df5..3503d5fde1d 100644 --- a/mysql-test/t/kill.test +++ b/mysql-test/t/kill.test @@ -15,6 +15,7 @@ connection con1; drop table if exists t1; --enable_warnings +--disable_reconnect create table t1 (kill_id int); insert into t1 values(connection_id()); @@ -25,7 +26,6 @@ kill @id; connection con1; ---disable_reconnect # this statement should fail --error 2006,2013 select 1; @@ -39,6 +39,8 @@ connection con2; select 4; drop table t1; +# End of 4.1 tests + # # test of blocking of sending ERROR after OK or EOF # |