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

fixes for test cases

Browse Source
This commit is contained in:
Sergei Golubchik 2014-09-16 14:04:50 +02:00
parent 7e29c1b539
commit d017953e2e
4 changed files with 8 additions and 6 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

@ -435,8 +435,8 @@ 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 3; KILL QUERY con_id;
CREATE OR REPLACE TABLE t1 (a int);; CREATE OR REPLACE TABLE t1 (a int);;
KILL QUERY 3; KILL QUERY con_id;
drop table t1; drop table t1;
DROP TABLE t2; DROP TABLE t2;

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

@ -348,6 +348,7 @@ LOCK TABLE t1 WRITE;
--connection default --connection default
--send CREATE OR REPLACE TABLE t1 LIKE tmp; --send CREATE OR REPLACE TABLE t1 LIKE tmp;
--connection con1 --connection con1
--replace_result $con_id con_id
eval KILL QUERY $con_id; eval KILL QUERY $con_id;
--connection default --connection default
@ -356,6 +357,7 @@ eval KILL QUERY $con_id;
--send CREATE OR REPLACE TABLE t1 (a int); --send CREATE OR REPLACE TABLE t1 (a int);
--connection con1 --connection con1
--replace_result $con_id con_id
eval KILL QUERY $con_id; eval KILL QUERY $con_id;
--connection default --connection default

4
storage/tokudb/mysql-test/tokudb/t/i_s_tokudb_lock_waits_released.test
View File

@ -1,7 +1,7 @@
# verify that information_schema.tokudb_locks gets populated with locks, information_schema.tokudb_lock_waits gets # verify that information_schema.tokudb_locks gets populated with locks, information_schema.tokudb_lock_waits gets
if (`select @@tokudb_version <= "7.1.7"`) if (`select @@tokudb_version <= "7.1.8"`)
{ {
--skip Race condition in the test in TokuDB 7.1.7 or earlier --skip Race condition in the test in TokuDB 7.1.8 or earlier
} }
# populated with 1 lock_wait and all transactions are present in information_schema.tokudb_trx for 2 clients # populated with 1 lock_wait and all transactions are present in information_schema.tokudb_trx for 2 clients

4
storage/tokudb/mysql-test/tokudb/t/i_s_tokudb_locks_released.test
View File

@ -1,6 +1,6 @@
if (`select @@tokudb_version <= "7.1.7"`) if (`select @@tokudb_version <= "7.1.8"`)
{ {
--skip Race condition in the test in TokuDB 7.1.7 or earlier --skip Race condition in the test in TokuDB 7.1.8 or earlier
} }
# verify that information_schema.tokudb_locks gets populated with locks for 2 clients # verify that information_schema.tokudb_locks gets populated with locks for 2 clients