diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-09-17 15:11:24 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-09-17 15:11:24 +0200 |
| commit | b04748c8cd8604039d4e5e97bf19013b03e8283b (patch) | |
| tree | 3b742da95439e47f3ff52acecd2e94725c758ce5 /mysql-test/r/create_or_replace.result | |
| parent | a006813fb1b465c219636350cf7cdcb2deba35d5 (diff) | |
| download | mariadb-git-b04748c8cd8604039d4e5e97bf19013b03e8283b.tar.gz | |
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.
Diffstat (limited to 'mysql-test/r/create_or_replace.result')
| -rw-r--r-- | mysql-test/r/create_or_replace.result | 4 |
1 files changed, 2 insertions, 2 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; |