Skip to content

Commit

Permalink
MDEV-9679 main.delayed fails sporadically
Browse files Browse the repository at this point in the history
update main.delayed test after 38b89a6
ALTER TABLE ... COMMENT is no longer blocking,
use a different ALTER TABLE variant.
  • Loading branch information
vuvova committed Mar 21, 2016
1 parent d158ba6 commit b9e5718
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion mysql-test/r/delayed.result
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,7 @@ SELECT * FROM t1 WHERE a=0;
a
# Connection con1
# Sending:
ALTER TABLE t1 COMMENT 'test';
ALTER TABLE t1 MODIFY a INT UNSIGNED;;
# Connection default
# Wait until ALTER TABLE is blocked on table 't1'.
INSERT DELAYED INTO t1 VALUES (3);
Expand Down
4 changes: 2 additions & 2 deletions mysql-test/t/delayed.test
Original file line number Diff line number Diff line change
Expand Up @@ -457,15 +457,15 @@ SELECT * FROM t1 WHERE a=0;
--echo # Connection con1
connection con1;
--echo # Sending:
--send ALTER TABLE t1 COMMENT 'test'
--send ALTER TABLE t1 MODIFY a INT UNSIGNED;

--echo # Connection default
connection default;
--echo # Wait until ALTER TABLE is blocked on table 't1'.
let $wait_condition=
SELECT COUNT(*) = 1 FROM information_schema.processlist
WHERE state = "Waiting for table metadata lock"
AND info = "ALTER TABLE t1 COMMENT 'test'";
AND info LIKE "ALTER TABLE t1%";
--source include/wait_condition.inc
--error ER_LOCK_DEADLOCK
INSERT DELAYED INTO t1 VALUES (3);
Expand Down

0 comments on commit b9e5718

Please sign in to comment.