diff options
| author | unknown <davi@buzz.(none)> | 2008-02-22 12:26:08 -0200 |
|---|---|---|
| committer | unknown <davi@buzz.(none)> | 2008-02-22 12:26:08 -0200 |
| commit | c9be87d0811a78c2ba5a533386c6a7443868e73e (patch) | |
| tree | de6a28ad299d1d90418fb94689bebd877cb31f9d | |
| parent | 6f044970276c270636766c21cba98294ec428e13 (diff) | |
| download | mariadb-git-c9be87d0811a78c2ba5a533386c6a7443868e73e.tar.gz | |
Disable concurrent inserts for the kill.test
mysql-test/r/kill.result:
Update test case result.
mysql-test/t/disabled.def:
Re-enable kill test, bug was closed.
mysql-test/t/kill.test:
Disable concurrent inserts for the kill test.
| -rw-r--r-- | mysql-test/r/kill.result | 1 | ||||
| -rw-r--r-- | mysql-test/t/disabled.def | 1 | ||||
| -rw-r--r-- | mysql-test/t/kill.test | 4 |
3 files changed, 5 insertions, 1 deletions
diff --git a/mysql-test/r/kill.result b/mysql-test/r/kill.result index 3ea5bbd20bc..a522d18f36b 100644 --- a/mysql-test/r/kill.result +++ b/mysql-test/r/kill.result @@ -1,3 +1,4 @@ +set @@global.concurrent_insert= 0; drop table if exists t1, t2, t3; create table t1 (kill_id int); insert into t1 values(connection_id()); diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def index 2cbfb3cf658..670a9c6a755 100644 --- a/mysql-test/t/disabled.def +++ b/mysql-test/t/disabled.def @@ -17,7 +17,6 @@ ctype_big5 : BUG#26711 2007-06-21 Lars Test has never worked on Do federated_transactions : Bug#29523 Transactions do not work events : Bug#32664 events.test fails randomly lowercase_table3 : Bug#32667 lowercase_table3.test reports to error log -kill : Bug#29149: Test "kill" fails on Windows innodb_mysql : Bug#32724: innodb_mysql.test fails randomly wait_timeout : Bug#32801 wait_timeout.test fails randomly ctype_create : Bug#32965 main.ctype_create fails diff --git a/mysql-test/t/kill.test b/mysql-test/t/kill.test index 3da4232502d..b7e1e82fe5d 100644 --- a/mysql-test/t/kill.test +++ b/mysql-test/t/kill.test @@ -6,6 +6,10 @@ # -- source include/not_embedded.inc +# Disable concurrent inserts to avoid test failures when reading the +# connection id which was inserted into a table by another thread. +set @@global.concurrent_insert= 0; + connect (con1, localhost, root,,); connect (con2, localhost, root,,); |