commit into mysql-6.0 branch (dlenev:2645) WL#3726

[Dmitry Lenev]

#At file:///home/dlenev/src/bzr/mysql-6.0-3726-w/

 2645 Dmitry Lenev	2008-05-25
      WL#3726 "DDL locking for all metadata objects".
      
      Fixed silly mistake in test case which caused sporadic
      kill.test failures.
modified:
  mysql-test/t/kill.test

per-file comments:
  mysql-test/t/kill.test
    Fixed silly mistake in several places where I was supposed to
    be waiting for certain state of connection I actually forgot
    to invoke wait_condition.inc script altough set appropriate
    variable. Indeed this caused sporadical test failures.

=== modified file 'mysql-test/t/kill.test'
--- a/mysql-test/t/kill.test	2008-05-23 13:54:03 +0000
+++ b/mysql-test/t/kill.test	2008-05-25 07:19:02 +0000
@@ -373,6 +373,7 @@
   select count(*) = 1 from information_schema.processlist
   where state = "Waiting for table" and
         info = "drop table t1";
+--source include/wait_condition.inc
 --replace_result $ID ID
 eval kill query $ID;
 --echo # Switching to connection 'ddl'
@@ -388,6 +389,7 @@
   select count(*) = 1 from information_schema.processlist
   where state = "Waiting for table" and
         info = "create trigger t1_bi before insert on t1 for each row set @a:=1";
+--source include/wait_condition.inc
 --replace_result $ID ID
 eval kill query $ID;
 --echo # Switching to connection 'ddl'
@@ -406,6 +408,7 @@
   select count(*) = 1 from information_schema.processlist
   where state = "Waiting for table" and
         info = "alter table t1 add column j int";
+--source include/wait_condition.inc
 --replace_result $ID ID
 eval kill query $ID;
 --echo # Switching to connection 'ddl'
@@ -421,6 +424,7 @@
   select count(*) = 1 from information_schema.processlist
   where state = "Waiting for table" and
         info = "alter table t1 rename to t2";
+--source include/wait_condition.inc
 --replace_result $ID ID
 eval kill query $ID;
 --echo # Switching to connection 'ddl'
@@ -434,6 +438,7 @@
   select count(*) = 1 from information_schema.processlist
   where state = "Waiting for table" and
         info = "alter table t1 disable keys";
+--source include/wait_condition.inc
 --replace_result $ID ID
 eval kill query $ID;
 --echo # Switching to connection 'ddl'
@@ -448,6 +453,7 @@
   select count(*) = 1 from information_schema.processlist
   where state = "Waiting for table" and
         info = "alter table t1 alter column i set default 100";
+--source include/wait_condition.inc
 --replace_result $ID ID
 eval kill query $ID;
 --echo # Switching to connection 'ddl'
@@ -469,6 +475,7 @@
   select count(*) = 1 from information_schema.processlist
   where state = "Waiting for table" and
         info = "alter table t2 alter column i set default 100";
+--source include/wait_condition.inc
 --replace_result $ID ID
 eval kill query $ID;
 --echo # Switching to connection 'ddl'
@@ -493,6 +500,7 @@
   select count(*) = 1 from information_schema.processlist
   where state = "Waiting for table" and
         info = "rename tables t1 to t3, t2 to t1";
+--source include/wait_condition.inc
 let $ID2= `select connection_id()`;
 --send insert into t2 values (1)
 --echo # Switching to connection 'default'
@@ -501,6 +509,7 @@
   select count(*) = 1 from information_schema.processlist
   where state = "Waiting for table" and
         info = "insert into t2 values (1)";
+--source include/wait_condition.inc
 --replace_result $ID2 ID2
 eval kill query $ID2;
 --echo # Switching to connection 'dml'
@@ -528,6 +537,7 @@
   select count(*) = 1 from information_schema.processlist
   where state = "Flushing tables" and
         info = "flush tables";
+--source include/wait_condition.inc
 --send select * from t1
 --echo # Switching to connection 'default'
 connection default;
@@ -535,6 +545,7 @@
   select count(*) = 1 from information_schema.processlist
   where state = "Waiting for table" and
         info = "select * from t1";
+--source include/wait_condition.inc
 --replace_result $ID2 ID2
 eval kill query $ID2;
 --echo # Switching to connection 'dml'