fix intermittent failures of main.create_or_replace test in buildbot
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:
parent
a006813fb1
commit
b04748c8cd
@ -434,9 +434,9 @@ unlock tables;
|
||||
CREATE TABLE t1 (col_int_nokey INT) ENGINE=InnoDB;
|
||||
CREATE OR REPLACE TEMPORARY TABLE tmp LIKE t1;
|
||||
LOCK TABLE t1 WRITE;
|
||||
CREATE OR REPLACE TABLE t1 LIKE tmp;;
|
||||
CREATE OR REPLACE TABLE t1 LIKE tmp;
|
||||
KILL QUERY con_id;
|
||||
CREATE OR REPLACE TABLE t1 (a int);;
|
||||
CREATE OR REPLACE TABLE t1 (a int);
|
||||
KILL QUERY con_id;
|
||||
drop table t1;
|
||||
DROP TABLE t2;
|
||||
|
@ -339,31 +339,31 @@ unlock tables;
|
||||
|
||||
CREATE TABLE t1 (col_int_nokey INT) ENGINE=InnoDB;
|
||||
|
||||
--let $con_id = `SELECT CONNECTION_ID()`
|
||||
CREATE OR REPLACE TEMPORARY TABLE tmp LIKE t1;
|
||||
LOCK TABLE t1 WRITE;
|
||||
|
||||
--connect (con1,localhost,root,,test)
|
||||
|
||||
--let $con_id = `SELECT CONNECTION_ID()`
|
||||
--send CREATE OR REPLACE TABLE t1 LIKE tmp
|
||||
--connection default
|
||||
--send CREATE OR REPLACE TABLE t1 LIKE tmp;
|
||||
--connection con1
|
||||
--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
|
||||
--reap
|
||||
--send CREATE OR REPLACE TABLE t1 (a int);
|
||||
|
||||
--connection con1
|
||||
--replace_result $con_id con_id
|
||||
eval KILL QUERY $con_id;
|
||||
--send CREATE OR REPLACE TABLE t1 (a int)
|
||||
|
||||
--connection default
|
||||
--replace_result $con_id con_id
|
||||
--eval KILL QUERY $con_id
|
||||
|
||||
--connection con1
|
||||
--error 0,ER_QUERY_INTERRUPTED
|
||||
--reap
|
||||
--disconnect con1
|
||||
--connection default
|
||||
|
||||
drop table t1;
|
||||
|
||||
#
|
||||
|
Loading…
x
Reference in New Issue
Block a user