diff options
| -rw-r--r-- | mysql-test/r/create_or_replace.result | 4 | ||||
| -rw-r--r-- | mysql-test/t/create_or_replace.test | 20 |
2 files changed, 12 insertions, 12 deletions
diff --git a/mysql-test/r/create_or_replace.result b/mysql-test/r/create_or_replace.result index 6e86dea3f9c..a2f06c38cb5 100644 --- a/mysql-test/r/create_or_replace.result +++ b/mysql-test/r/create_or_replace.result @@ -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; diff --git a/mysql-test/t/create_or_replace.test b/mysql-test/t/create_or_replace.test index 02d96a52114..2bdd23c21f6 100644 --- a/mysql-test/t/create_or_replace.test +++ b/mysql-test/t/create_or_replace.test @@ -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); +--send CREATE OR REPLACE TABLE t1 (a int) ---connection con1 +--connection default --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 --disconnect con1 +--connection default + drop table t1; # |