1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix intermittent failures of main.create_or_replace test in buildbot

Browse Source 
don't kill statements in the default connection, kill them in a connection that
will be closed - it'll guarantee that `KILL con_id` will not apply to unrelated statements.
This commit is contained in:
Sergei Golubchik 2014-09-17 15:11:24 +02:00
parent a006813fb1
commit b04748c8cd
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/r/create_or_replace.result
View File

@ -434,9 +434,9 @@ unlock tables;
CREATE TABLE t1 (col_int_nokey INT) ENGINE=InnoDB; CREATE TABLE t1 (col_int_nokey INT) ENGINE=InnoDB;
CREATE OR REPLACE TEMPORARY TABLE tmp LIKE t1; CREATE OR REPLACE TEMPORARY TABLE tmp LIKE t1;
LOCK TABLE t1 WRITE; LOCK TABLE t1 WRITE;
CREATE OR REPLACE TABLE t1 LIKE tmp;; CREATE OR REPLACE TABLE t1 LIKE tmp;
KILL QUERY con_id; KILL QUERY con_id;
CREATE OR REPLACE TABLE t1 (a int);; CREATE OR REPLACE TABLE t1 (a int);
KILL QUERY con_id; KILL QUERY con_id;
drop table t1; drop table t1;
DROP TABLE t2; DROP TABLE t2;

22
mysql-test/t/create_or_replace.test
View File

@ -339,31 +339,31 @@ unlock tables;
CREATE TABLE t1 (col_int_nokey INT) ENGINE=InnoDB; CREATE TABLE t1 (col_int_nokey INT) ENGINE=InnoDB;
--let $con_id = `SELECT CONNECTION_ID()`
CREATE OR REPLACE TEMPORARY TABLE tmp LIKE t1; CREATE OR REPLACE TEMPORARY TABLE tmp LIKE t1;
LOCK TABLE t1 WRITE; LOCK TABLE t1 WRITE;
--connect (con1,localhost,root,,test) --connect (con1,localhost,root,,test)
--let $con_id = `SELECT CONNECTION_ID()`
--send CREATE OR REPLACE TABLE t1 LIKE tmp
--connection default --connection default
--send CREATE OR REPLACE TABLE t1 LIKE tmp;
--connection con1
--replace_result $con_id con_id --replace_result $con_id con_id
eval KILL QUERY $con_id; --eval KILL QUERY $con_id
--connection default --connection con1
--error 0,ER_QUERY_INTERRUPTED --error 0,ER_QUERY_INTERRUPTED
--reap --reap
--send CREATE OR REPLACE TABLE t1 (a int); --send CREATE OR REPLACE TABLE t1 (a int)
--connection con1
--replace_result $con_id con_id
eval KILL QUERY $con_id;
--connection default --connection default
--replace_result $con_id con_id
--eval KILL QUERY $con_id
--connection con1
--error 0,ER_QUERY_INTERRUPTED --error 0,ER_QUERY_INTERRUPTED
--reap --reap
--disconnect con1 --disconnect con1
--connection default
drop table t1; drop table t1;
# #