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

fix mdl_sync test to work now when ALTER TABLE .. ENGINE=xxx may be executed online

Browse Source
This commit is contained in:
Sergei Golubchik 2014-05-08 10:25:24 +02:00
parent c8ee83ee8a
commit 3e7519f17e
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mysql-test/r/mdl_sync.result
View File

@ -3086,18 +3086,17 @@ DELETE FROM t2 WHERE a = 3;
# Now that DELETE blocks on a metadata lock, we should be able to do # Now that DELETE blocks on a metadata lock, we should be able to do
# SELECT * FROM m1 here. SELECT used to be blocked by a DELETE table # SELECT * FROM m1 here. SELECT used to be blocked by a DELETE table
# lock request. # lock request.
SELECT * FROM m1; SELECT * FROM m1 WHERE a < 3;
a
1
2
3
4
# Resuming ALTER TABLE # Resuming ALTER TABLE
SET DEBUG_SYNC= 'now SIGNAL continue'; SET DEBUG_SYNC= 'now SIGNAL continue';
# Connection con1 # Connection con1
# Reaping: ALTER TABLE m1 engine=MERGE UNION=(t2, t1) # Reaping: ALTER TABLE m1 engine=MERGE UNION=(t2, t1)
# Connection con2 # Connection con2
# Reaping: DELETE FROM t2 WHERE a = 3 # Reaping: DELETE FROM t2 WHERE a = 3
# Reaping: SELECT * FROM m1 WHERE a < 3
a
1
2
# Connection default # Connection default
DROP TABLE m1, t1, t2; DROP TABLE m1, t1, t2;
SET DEBUG_SYNC= 'RESET'; SET DEBUG_SYNC= 'RESET';

11
mysql-test/t/mdl_sync.test
View File

@ -4750,6 +4750,7 @@ INSERT INTO t2 VALUES (3), (4);
connect(con1, localhost, root); connect(con1, localhost, root);
connect(con2, localhost, root); connect(con2, localhost, root);
connect(con3, localhost, root);
--echo # Connection con1 --echo # Connection con1
connection con1; connection con1;
@ -4769,7 +4770,7 @@ SET DEBUG_SYNC= 'now WAIT_FOR upgrade';
--send DELETE FROM t2 WHERE a = 3 --send DELETE FROM t2 WHERE a = 3
--echo # Connection default --echo # Connection default
connection default; connection con3;
--echo # Check that DELETE is waiting on a metadata lock and not a table lock. --echo # Check that DELETE is waiting on a metadata lock and not a table lock.
let $wait_condition= let $wait_condition=
SELECT COUNT(*) = 1 FROM information_schema.processlist SELECT COUNT(*) = 1 FROM information_schema.processlist
@ -4779,7 +4780,9 @@ let $wait_condition=
--echo # Now that DELETE blocks on a metadata lock, we should be able to do --echo # Now that DELETE blocks on a metadata lock, we should be able to do
--echo # SELECT * FROM m1 here. SELECT used to be blocked by a DELETE table --echo # SELECT * FROM m1 here. SELECT used to be blocked by a DELETE table
--echo # lock request. --echo # lock request.
SELECT * FROM m1; --send SELECT * FROM m1 WHERE a < 3
connection default;
--echo # Resuming ALTER TABLE --echo # Resuming ALTER TABLE
SET DEBUG_SYNC= 'now SIGNAL continue'; SET DEBUG_SYNC= 'now SIGNAL continue';
@ -4791,12 +4794,16 @@ connection con1;
connection con2; connection con2;
--echo # Reaping: DELETE FROM t2 WHERE a = 3 --echo # Reaping: DELETE FROM t2 WHERE a = 3
--reap --reap
connection con3;
--echo # Reaping: SELECT * FROM m1 WHERE a < 3
--reap
--echo # Connection default --echo # Connection default
connection default; connection default;
DROP TABLE m1, t1, t2; DROP TABLE m1, t1, t2;
SET DEBUG_SYNC= 'RESET'; SET DEBUG_SYNC= 'RESET';
disconnect con1; disconnect con1;
disconnect con2; disconnect con2;
disconnect con3;
# Check that all connections opened by test cases in this file are really # Check that all connections opened by test cases in this file are really