From 916fd68669de9dbd56a336e3ca1b92138befc857 Mon Sep 17 00:00:00 2001 From: Dmitry Lenev Date: Mon, 1 Feb 2010 20:59:59 +0300 Subject: [PATCH] Fix for sporadical hangs of mdl_sync.test caused by patch which implemented new type-of-operation-aware metadata locks and added a wait-for graph based deadlock detector to the MDL subsystem (this patch fixed bug #46272 "MySQL 5.4.4, new MDL: unnecessary deadlock" and bug #37346 "innodb does not detect deadlock between update and alter table"). These hangs were caused by missing include of wait_condition.inc. This fix simply adds them. mysql-test/t/mdl_sync.test: Added missing include of wait_condition.inc. --- mysql-test/t/mdl_sync.test | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mysql-test/t/mdl_sync.test b/mysql-test/t/mdl_sync.test index dda9ba991cf..0f3091794f1 100644 --- a/mysql-test/t/mdl_sync.test +++ b/mysql-test/t/mdl_sync.test @@ -2307,6 +2307,7 @@ connection handler_con1; let $wait_condition= select count(*) = 1 from information_schema.processlist where state = "Waiting for table" and info = "insert into t1 values (1)"; +--source include/wait_condition.inc --echo # The below ALTER TABLE will be blocked because of presence of HANDLER. --echo # Sending: --send alter table t1 add column j int; @@ -2352,6 +2353,7 @@ connection handler_con1; let $wait_condition= select count(*) = 1 from information_schema.processlist where state = "Waiting for table" and info = "insert into t2 values (1)"; +--source include/wait_condition.inc --echo # The below ALTER TABLE will be blocked because of presence of HANDLER. --echo # Sending: --send alter table t1 drop column j;