diff options
| author | unknown <monty@mysql.com> | 2005-08-18 03:41:11 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2005-08-18 03:41:11 +0300 |
| commit | 4d2bf4befcf6a91978c60b9a402301e864ed999e (patch) | |
| tree | 72281ee9348757fbd04126a586d682b50939dfe5 /mysql-test/t | |
| parent | f90f654117e174e47fe220e8911c04fc9816e6da (diff) | |
| parent | 44086a625ba427522c7984f71a94f61d22122f3b (diff) | |
| download | mariadb-git-4d2bf4befcf6a91978c60b9a402301e864ed999e.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'mysql-test/t')
| -rw-r--r-- | mysql-test/t/kill.test | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/t/kill.test b/mysql-test/t/kill.test index 09ad3f59c10..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; |