database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

MDEV-9679 main.delayed fails sporadically

Browse Source 
update main.delayed test after 38b89a61
ALTER TABLE ... COMMENT is no longer blocking,
use a different ALTER TABLE variant.
This commit is contained in:
Sergei Golubchik
2016-03-18 13:57:46 +01:00
parent d158ba62f7
commit b9e571882b
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/r/delayed.result
View File

@ -379,7 +379,7 @@ SELECT * FROM t1 WHERE a=0;
a a
# Connection con1 # Connection con1
# Sending: # Sending:
ALTER TABLE t1 COMMENT 'test'; ALTER TABLE t1 MODIFY a INT UNSIGNED;;
# Connection default # Connection default
# Wait until ALTER TABLE is blocked on table 't1'. # Wait until ALTER TABLE is blocked on table 't1'.
INSERT DELAYED INTO t1 VALUES (3); INSERT DELAYED INTO t1 VALUES (3);

4
mysql-test/t/delayed.test
View File

@ -457,7 +457,7 @@ SELECT * FROM t1 WHERE a=0;
--echo # Connection con1 --echo # Connection con1
connection con1; connection con1;
--echo # Sending: --echo # Sending:
--send ALTER TABLE t1 COMMENT 'test' --send ALTER TABLE t1 MODIFY a INT UNSIGNED;
--echo # Connection default --echo # Connection default
connection default; connection default;
@ -465,7 +465,7 @@ connection default;
let $wait_condition= let $wait_condition=
SELECT COUNT(*) = 1 FROM information_schema.processlist SELECT COUNT(*) = 1 FROM information_schema.processlist
WHERE state = "Waiting for table metadata lock" 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 --source include/wait_condition.inc
--error ER_LOCK_DEADLOCK --error ER_LOCK_DEADLOCK
INSERT DELAYED INTO t1 VALUES (3); INSERT DELAYED INTO t1 VALUES (3);