Part of fix for bug#52044 "FLUSH TABLES WITH READ LOCK and

FLUSH TABLES <list> WITH READ LOCK are incompatible" to
be pushed as separate patch.

Replaced thread state name "Waiting for table", which was
used by threads waiting for a metadata lock or table flush, 
with a set of names which better reflect types of resources
being waited for.

Also replaced "Table lock" thread state name, which was used 
by threads waiting on thr_lock.c table level lock, with more
elaborate "Waiting for table level lock", to make it 
more consistent with other thread state names.

Updated test cases and their results according to these 
changes.

Fixed sys_vars.query_cache_wlock_invalidate_func test to not
to wait for timeout of wait_condition.inc script.

mysql-test/r/query_cache.result:
  Added test coverage for query_cache_wlock_invalidate
  behavior for implicitly locked tables.
mysql-test/suite/sys_vars/r/query_cache_wlock_invalidate_func.result:
  Fixed sys_vars.query_cache_wlock_invalidate_func test to not
  to wait for timeout of wait_condition.inc script. Reverted
  changes to test which introduced timeout and replaced waiting
  condition with a more appropriate one.
  Test coverage for query_cache_wlock_invalidate behavior for
  implicitly locked tables was added to query_cache.test.
mysql-test/suite/sys_vars/t/query_cache_wlock_invalidate_func.test:
  Fixed sys_vars.query_cache_wlock_invalidate_func test to not
  to wait for timeout of wait_condition.inc script. Reverted
  changes to test which introduced timeout and replaced waiting
  condition with a more appropriate one.
  Test coverage for query_cache_wlock_invalidate behavior for
  implicitly locked tables was added to query_cache.test.
mysql-test/t/query_cache.test:
  Added test coverage for query_cache_wlock_invalidate
  behavior for implicitly locked tables.
mysys/thr_lock.c:
  Replaced "Table lock" thread state name, which was used by 
  threads waiting on thr_lock.c table level lock, with more
  elaborate "Waiting for table level lock", to make it 
  consistent with thread state names which are used while
  waiting for metadata locks and table flush.
sql/mdl.cc:
  Replaced thread state name "Waiting for table", which was
  used by threads waiting for a metadata lock or table flush, 
  with a set of names which better reflect types of resources
  being waited for. 
  
  To implement this:
  - Adjusted MDL_wait::timed_wait() to take thread state name
    as parameter.
  - Introduced method of MDL_key class which allows to get
    thread state name to be used while waiting for resource
    corresponding to the key and changed code to use it.
    Added array translating namespaces to thread state names
    as part of this change.
sql/mdl.h:
  To implement this:
  - Adjusted MDL_wait::timed_wait() to take thread state name
    as parameter.
  - Introduced method of MDL_key class which allows to get
    thread state name to be used while waiting for resource
    corresponding to the key and changed code to use it.
    Added array translating namespaces to thread state names
    as part of this change.
sql/sql_base.cc:
  Replaced thread state name "Waiting for table", which was
  used by threads waiting for table flush, with a more elaborate
  "Waiting for table flush".

1 files changed, 207 insertions, 110 deletions

diff --git a/mysql-test/t/mdl_sync.test b/mysql-test/t/mdl_sync.test
index 6b721ace07f..8f33a788c67 100644
--- a/mysql-test/t/mdl_sync.test
+++ b/mysql-test/t/mdl_sync.test
@@ -128,7 +128,8 @@ connection mdl_con2;
 --echo # Check that the above RENAME is blocked because of S lock.
 let $wait_condition=
   select count(*) = 1 from information_schema.processlist
-  where state = "Waiting for table" and info = "rename table t1 to t2";
+  where state = "Waiting for table metadata lock" and
+        info = "rename table t1 to t2";
 --source include/wait_condition.inc
 --echo # 
 --echo # Switching to connection 'default'.
@@ -158,7 +159,8 @@ connection mdl_con2;
 --echo # Check that the above ALTER TABLE is blocked because of S lock.
 let $wait_condition=
   select count(*) = 1 from information_schema.processlist
-  where state = "Waiting for table" and info = "alter table t1 add column c2 int";
+  where state = "Waiting for table metadata lock" and
+        info = "alter table t1 add column c2 int";
 --source include/wait_condition.inc
 --echo # 
 --echo # Switching to connection 'default'.
@@ -190,7 +192,8 @@ connection mdl_con2;
 --echo # because of S lock.
 let $wait_condition=
   select count(*) = 1 from information_schema.processlist
-  where state = "Waiting for table" and info = "alter table t1 add column c2 int";
+  where state = "Waiting for table metadata lock" and
+        info = "alter table t1 add column c2 int";
 --source include/wait_condition.inc
 --echo # 
 --echo # Switching to connection 'default'.
@@ -245,7 +248,8 @@ connection mdl_con2;
 --echo # Check that the above RENAME is blocked because of SH lock.
 let $wait_condition=
   select count(*) = 1 from information_schema.processlist
-  where state = "Waiting for table" and info = "rename table t1 to t2";
+  where state = "Waiting for table metadata lock" and
+        info = "rename table t1 to t2";
 --source include/wait_condition.inc
 --echo # Unblock RENAME TABLE.
 set debug_sync= 'now SIGNAL finish';
@@ -280,7 +284,8 @@ connection mdl_con2;
 --echo # Check that the above ALTER TABLE is blocked because of SH lock.
 let $wait_condition=
   select count(*) = 1 from information_schema.processlist
-  where state = "Waiting for table" and info = "alter table t1 add column c2 int";
+  where state = "Waiting for table metadata lock" and
+        info = "alter table t1 add column c2 int";
 --source include/wait_condition.inc
 --echo # Unblock RENAME TABLE.
 set debug_sync= 'now SIGNAL finish';
@@ -316,7 +321,8 @@ connection mdl_con2;
 --echo # because of S lock.
 let $wait_condition=
   select count(*) = 1 from information_schema.processlist
-  where state = "Waiting for table" and info = "alter table t1 add column c2 int";
+  where state = "Waiting for table metadata lock" and
+        info = "alter table t1 add column c2 int";
 --source include/wait_condition.inc
 --echo # Unblock RENAME TABLE.
 set debug_sync= 'now SIGNAL finish';
@@ -367,7 +373,8 @@ connection default;
 --echo # Check that the above LOCK TABLES is blocked because of SR lock.
 let $wait_condition=
   select count(*) = 1 from information_schema.processlist
-  where state = "Waiting for table" and info = "lock table t1 write";
+  where state = "Waiting for table metadata lock" and 
+        info = "lock table t1 write";
 --source include/wait_condition.inc
 --echo # Unblock LOCK TABLES.
 commit;
@@ -395,7 +402,8 @@ connection mdl_con2;
 --echo # Check that the above RENAME is blocked because of SR lock.
 let $wait_condition=
   select count(*) = 1 from information_schema.processlist
-  where state = "Waiting for table" and info = "rename table t1 to t2";
+  where state = "Waiting for table metadata lock" and
+        info = "rename table t1 to t2";
 --source include/wait_condition.inc
 --echo # 
 --echo # Switching to connection 'default'.
@@ -426,7 +434,8 @@ connection mdl_con2;
 --echo # Check that the above ALTER TABLE is blocked because of SR lock.
 let $wait_condition=
   select count(*) = 1 from information_schema.processlist
-  where state = "Waiting for table" and info = "alter table t1 add column c2 int";
+  where state = "Waiting for table metadata lock" and
+        info = "alter table t1 add column c2 int";
 --source include/wait_condition.inc
 --echo # 
 --echo # Switching to connection 'default'.
@@ -479,7 +488,8 @@ connection default;
 --echo # Check that the above ALTER TABLE is blocked because of SW lock.
 let $wait_condition=
   select count(*) = 1 from information_schema.processlist
-  where state = "Waiting for table" and info = "alter table t1 add primary key (c1)";
+  where state = "Waiting for table metadata lock" and
+        info = "alter table t1 add primary key (c1)";
 --source include/wait_condition.inc
 --echo # Unblock ALTER TABLE.
 commit;
@@ -506,7 +516,8 @@ connection default;
 --echo # Check that the above LOCK TABLES is blocked because of SW lock.
 let $wait_condition=
   select count(*) = 1 from information_schema.processlist
-  where state = "Waiting for table" and info = "lock table t1 write";
+  where state = "Waiting for table metadata lock" and
+        info = "lock table t1 write";
 --source include/wait_condition.inc
 --echo # Unblock LOCK TABLES.
 commit;
@@ -534,7 +545,8 @@ connection mdl_con2;
 --echo # Check that the above RENAME is blocked because of SW lock.
 let $wait_condition=
   select count(*) = 1 from information_schema.processlist
-  where state = "Waiting for table" and info = "rename table t1 to t2";
+  where state = "Waiting for table metadata lock" and
+        info = "rename table t1 to t2";
 --source include/wait_condition.inc
 --echo # 
 --echo # Switching to connection 'default'.
@@ -583,7 +595,8 @@ connection mdl_con2;
 --echo # Check that the above DELETE is blocked because of SNW lock.
 let $wait_condition=
   select count(*) = 1 from information_schema.processlist
-  where state = "Waiting for table" and info = "delete from t1 limit 2";
+  where state = "Waiting for table metadata lock" and
+        info = "delete from t1 limit 2";
 --source include/wait_condition.inc
 --echo # Unblock ALTER and thus DELETE.
 set debug_sync= 'now SIGNAL finish';
@@ -617,7 +630,8 @@ connection mdl_con2;
 --echo # Check that the above ALTER is blocked because of SNW lock.
 let $wait_condition=
   select count(*) = 1 from information_schema.processlist
-  where state = "Waiting for table" and info = "alter table t1 add primary key (c1)";
+  where state = "Waiting for table metadata lock" and
+        info = "alter table t1 add primary key (c1)";
 --source include/wait_condition.inc
 --echo # Unblock ALTERs.
 set debug_sync= 'now SIGNAL finish';
@@ -652,7 +666,8 @@ connection mdl_con2;
 --echo # Check that the above LOCK TABLES is blocked because of SNW lock.
 let $wait_condition=
   select count(*) = 1 from information_schema.processlist
-  where state = "Waiting for table" and info = "lock table t1 write";
+  where state = "Waiting for table metadata lock" and
+        info = "lock table t1 write";
 --source include/wait_condition.inc
 --echo # Unblock ALTER and thus LOCK TABLES.
 set debug_sync= 'now SIGNAL finish';
@@ -688,7 +703,8 @@ connection mdl_con2;
 --echo # Check that the above RENAME is blocked because of SNW lock.
 let $wait_condition=
   select count(*) = 1 from information_schema.processlist
-  where state = "Waiting for table" and info = "rename table t1 to t2";
+  where state = "Waiting for table metadata lock" and
+        info = "rename table t1 to t2";
 --source include/wait_condition.inc
 --echo # Unblock ALTER and thus RENAME TABLE.
 set debug_sync= 'now SIGNAL finish';
@@ -735,7 +751,8 @@ connection default;
 --echo # Check that the above SELECT is blocked because of SNRW lock.
 let $wait_condition=
   select count(*) = 1 from information_schema.processlist
-  where state = "Waiting for table" and info = "select count(*) from t1";
+  where state = "Waiting for table metadata lock" and
+        info = "select count(*) from t1";
 --source include/wait_condition.inc
 --echo # Unblock SELECT.
 unlock tables;
@@ -760,7 +777,8 @@ connection default;
 --echo # Check that the above DELETE is blocked because of SNRW lock.
 let $wait_condition=
   select count(*) = 1 from information_schema.processlist
-  where state = "Waiting for table" and info = "delete from t1 limit 1";
+  where state = "Waiting for table metadata lock" and
+        info = "delete from t1 limit 1";
 --source include/wait_condition.inc
 --echo # Unblock DELETE.
 unlock tables;
@@ -785,7 +803,8 @@ connection default;
 --echo # Check that the above ALTER is blocked because of UNWR lock.
 let $wait_condition=
   select count(*) = 1 from information_schema.processlist
-  where state = "Waiting for table" and info = "alter table t1 add primary key (c1)";
+  where state = "Waiting for table metadata lock" and
+        info = "alter table t1 add primary key (c1)";
 --source include/wait_condition.inc
 --echo # Unblock ALTER.
 unlock tables;
@@ -811,7 +830,8 @@ connection default;
 --echo # Check that the above LOCK TABLES is blocked because of SNRW lock.
 let $wait_condition=
   select count(*) = 1 from information_schema.processlist
-  where state = "Waiting for table" and info = "lock table t1 write";
+  where state = "Waiting for table metadata lock" and
+        info = "lock table t1 write";
 --source include/wait_condition.inc
 --echo # Unblock waiting LOCK TABLES.
 unlock tables;
@@ -838,7 +858,8 @@ connection default;
 --echo # Check that the above RENAME is blocked because of SNRW lock.
 let $wait_condition=
   select count(*) = 1 from information_schema.processlist
-  where state = "Waiting for table" and info = "rename table t1 to t2";
+  where state = "Waiting for table metadata lock" and
+        info = "rename table t1 to t2";
 --source include/wait_condition.inc
 --echo # Unblock RENAME TABLE
 unlock tables;
@@ -879,7 +900,8 @@ connection mdl_con1;
 --echo # Check that RENAME has acquired X lock on t1 and is waiting for t2.
 let $wait_condition=
 select count(*) = 1 from information_schema.processlist
-where state = "Waiting for table" and info = "rename table t1 to t2";
+where state = "Waiting for table metadata lock" and
+      info = "rename table t1 to t2";
 --source include/wait_condition.inc
 --echo # Check that S lock in incompatible with X lock.
 --echo # Sending:
@@ -890,7 +912,8 @@ connection mdl_con2;
 --echo # Check that the above HANDLER statement is blocked because of X lock.
 let $wait_condition=
 select count(*) = 1 from information_schema.processlist
-where state = "Waiting for table" and info = "handler t1 open";
+where state = "Waiting for table metadata lock" and
+      info = "handler t1 open";
 --source include/wait_condition.inc
 --echo # Unblock RENAME TABLE
 unlock tables;
@@ -922,7 +945,8 @@ connection mdl_con1;
 --echo # Check that RENAME has acquired X lock on t1 and is waiting for t2.
 let $wait_condition=
 select count(*) = 1 from information_schema.processlist
-where state = "Waiting for table" and info = "rename table t1 to t2";
+where state = "Waiting for table metadata lock" and
+      info = "rename table t1 to t2";
 --source include/wait_condition.inc
 --echo # Check that SH lock in incompatible with X lock.
 --echo # Sending:
@@ -934,7 +958,8 @@ connection mdl_con2;
 --echo # because of X lock.
 let $wait_condition=
 select count(*) = 1 from information_schema.processlist
-where state = "Waiting for table" and info like "select column_name from information_schema.columns%";
+where state = "Waiting for table metadata lock" and
+      info like "select column_name from information_schema.columns%";
 --source include/wait_condition.inc
 --echo # Unblock RENAME TABLE
 unlock tables;
@@ -965,7 +990,8 @@ connection mdl_con1;
 --echo # Check that RENAME has acquired X lock on t1 and is waiting for t2.
 let $wait_condition=
 select count(*) = 1 from information_schema.processlist
-where state = "Waiting for table" and info = "rename table t1 to t2";
+where state = "Waiting for table metadata lock" and
+      info = "rename table t1 to t2";
 --source include/wait_condition.inc
 --echo # Check that SR lock in incompatible with X lock.
 --echo # Sending:
@@ -977,7 +1003,8 @@ connection mdl_con2;
 --echo # because of X lock.
 let $wait_condition=
 select count(*) = 1 from information_schema.processlist
-where state = "Waiting for table" and info = "select count(*) from t1";
+where state = "Waiting for table metadata lock" and 
+      info = "select count(*) from t1";
 --source include/wait_condition.inc
 --echo # Unblock RENAME TABLE
 unlock tables;
@@ -1008,7 +1035,8 @@ connection mdl_con1;
 --echo # Check that RENAME has acquired X lock on t1 and is waiting for t2.
 let $wait_condition=
 select count(*) = 1 from information_schema.processlist
-where state = "Waiting for table" and info = "rename table t1 to t2";
+where state = "Waiting for table metadata lock" and
+      info = "rename table t1 to t2";
 --source include/wait_condition.inc
 --echo # Check that SW lock in incompatible with X lock.
 --echo # Sending:
@@ -1020,7 +1048,8 @@ connection mdl_con2;
 --echo # because of X lock.
 let $wait_condition=
 select count(*) = 1 from information_schema.processlist
-where state = "Waiting for table" and info = "delete from t1 limit 1";
+where state = "Waiting for table metadata lock" and
+      info = "delete from t1 limit 1";
 --source include/wait_condition.inc
 --echo # Unblock RENAME TABLE
 unlock tables;
@@ -1051,7 +1080,8 @@ connection mdl_con1;
 --echo # Check that RENAME has acquired X lock on t1 and is waiting for t2.
 let $wait_condition=
 select count(*) = 1 from information_schema.processlist
-where state = "Waiting for table" and info = "rename table t1 to t2";
+where state = "Waiting for table metadata lock" and
+      info = "rename table t1 to t2";
 --source include/wait_condition.inc
 --echo # Check that SNW lock is incompatible with X lock.
 --echo # Sending:
@@ -1063,7 +1093,8 @@ connection mdl_con2;
 --echo # because of X lock.
 let $wait_condition=
 select count(*) = 1 from information_schema.processlist
-where state = "Waiting for table" and info = "alter table t1 add primary key (c1)";
+where state = "Waiting for table metadata lock" and
+      info = "alter table t1 add primary key (c1)";
 --source include/wait_condition.inc
 --echo # Unblock RENAME TABLE
 unlock tables;
@@ -1095,7 +1126,8 @@ connection mdl_con1;
 --echo # Check that RENAME has acquired X lock on t1 and is waiting for t2.
 let $wait_condition=
 select count(*) = 1 from information_schema.processlist
-where state = "Waiting for table" and info = "rename table t1 to t2";
+where state = "Waiting for table metadata lock" and
+      info = "rename table t1 to t2";
 --source include/wait_condition.inc
 --echo # Check that SNRW lock is incompatible with X lock.
 --echo # Sending:
@@ -1107,7 +1139,8 @@ connection mdl_con2;
 --echo # because of X lock.
 let $wait_condition=
 select count(*) = 1 from information_schema.processlist
-where state = "Waiting for table" and info = "lock table t1 write";
+where state = "Waiting for table metadata lock" and
+      info = "lock table t1 write";
 --source include/wait_condition.inc
 --echo # Unblock RENAME TABLE
 unlock tables;
@@ -1139,7 +1172,8 @@ connection mdl_con1;
 --echo # Check that RENAME has acquired X lock on t1 and is waiting for t2.
 let $wait_condition=
 select count(*) = 1 from information_schema.processlist
-where state = "Waiting for table" and info = "rename table t1 to t2";
+where state = "Waiting for table metadata lock" and
+      info = "rename table t1 to t2";
 --source include/wait_condition.inc
 --echo # Check that X lock is incompatible with X lock.
 --echo # Sending:
@@ -1151,7 +1185,8 @@ connection mdl_con2;
 --echo # because of X lock.
 let $wait_condition=
 select count(*) = 1 from information_schema.processlist
-where state = "Waiting for table" and info = "rename table t1 to t3";
+where state = "Waiting for table metadata lock" and
+      info = "rename table t1 to t3";
 --source include/wait_condition.inc
 --echo # Unblock RENAME TABLE
 unlock tables;
@@ -1195,7 +1230,8 @@ connection mdl_con1;
 --echo # Check that ALTER TABLE is waiting with pending SNW lock.
 let $wait_condition=
 select count(*) = 1 from information_schema.processlist
-where state = "Waiting for table" and info = "alter table t1 add primary key (c1)";
+where state = "Waiting for table metadata lock" and
+      info = "alter table t1 add primary key (c1)";
 --source include/wait_condition.inc
 --echo # Check that S, SH and SR locks are compatible with pending SNW
 handler t1 open t;
@@ -1212,7 +1248,8 @@ connection mdl_con2;
 --echo # Check that the above DELETE is blocked because of pending SNW lock.
 let $wait_condition=
 select count(*) = 1 from information_schema.processlist
-where state = "Waiting for table" and info = "delete from t1 limit 1";
+where state = "Waiting for table metadata lock" and
+      info = "delete from t1 limit 1";
 --source include/wait_condition.inc
 --echo # Unblock ALTER TABLE.
 commit;
@@ -1252,7 +1289,8 @@ connection mdl_con1;
 --echo # Check that LOCK TABLE is waiting with pending SNRW lock.
 let $wait_condition=
 select count(*) = 1 from information_schema.processlist
-where state = "Waiting for table" and info = "lock table t1 write";
+where state = "Waiting for table metadata lock" and
+      info = "lock table t1 write";
 --source include/wait_condition.inc
 --echo # Check that S and SH locks are compatible with pending SNRW
 handler t1 open t;
@@ -1268,7 +1306,8 @@ connection mdl_con2;
 --echo # Check that the above SELECT is blocked because of pending SNRW lock.
 let $wait_condition=
 select count(*) = 1 from information_schema.processlist
-where state = "Waiting for table" and info = "select count(*) from t1";
+where state = "Waiting for table metadata lock" and
+      info = "select count(*) from t1";
 --source include/wait_condition.inc
 --echo # Unblock LOCK TABLE.
 commit;
@@ -1300,7 +1339,8 @@ connection mdl_con1;
 --echo # Check that LOCK TABLE is waiting with pending SNRW lock.
 let $wait_condition=
 select count(*) = 1 from information_schema.processlist
-where state = "Waiting for table" and info = "lock table t1 write";
+where state = "Waiting for table metadata lock" and
+      info = "lock table t1 write";
 --source include/wait_condition.inc
 --echo # Check that SW is incompatible with pending SNRW
 --echo # Sending:
@@ -1311,7 +1351,8 @@ connection mdl_con2;
 --echo # Check that the above INSERT is blocked because of pending SNRW lock.
 let $wait_condition=
 select count(*) = 1 from information_schema.processlist
-where state = "Waiting for table" and info = "insert into t1 values (1)";
+where state = "Waiting for table metadata lock" and
+      info = "insert into t1 values (1)";
 --source include/wait_condition.inc
 --echo # Unblock LOCK TABLE.
 commit;
@@ -1343,7 +1384,8 @@ connection mdl_con1;
 --echo # Check that LOCK TABLE is waiting with pending SNRW lock.
 let $wait_condition=
 select count(*) = 1 from information_schema.processlist
-where state = "Waiting for table" and info = "lock table t1 write";
+where state = "Waiting for table metadata lock" and
+      info = "lock table t1 write";
 --source include/wait_condition.inc
 --echo # Check that SNW is compatible with pending SNRW
 --echo # So ALTER TABLE statements are not starved by LOCK TABLEs.
@@ -1385,7 +1427,8 @@ connection mdl_con1;
 --echo # Check that RENAME TABLE is waiting with pending X lock.
 let $wait_condition=
 select count(*) = 1 from information_schema.processlist
-where state = "Waiting for table" and info = "rename table t1 to t2";
+where state = "Waiting for table metadata lock" and
+      info = "rename table t1 to t2";
 --source include/wait_condition.inc
 --echo # Check that SH locks are compatible with pending X
 select column_name from information_schema.columns where
@@ -1399,7 +1442,8 @@ connection mdl_con2;
 --echo # Check that the above HANDLER OPEN is blocked because of pending X lock.
 let $wait_condition=
 select count(*) = 1 from information_schema.processlist
-where state = "Waiting for table" and info = "handler t1 open";
+where state = "Waiting for table metadata lock" and
+      info = "handler t1 open";
 --source include/wait_condition.inc
 --echo # Unblock RENAME TABLE.
 commit;
@@ -1433,7 +1477,8 @@ connection mdl_con1;
 --echo # Check that RENAME TABLE is waiting with pending X lock.
 let $wait_condition=
 select count(*) = 1 from information_schema.processlist
-where state = "Waiting for table" and info = "rename table t1 to t2";
+where state = "Waiting for table metadata lock" and
+      info = "rename table t1 to t2";
 --source include/wait_condition.inc
 --echo # Check that SR is incompatible with pending X
 --echo # Sending:
@@ -1444,7 +1489,8 @@ connection mdl_con2;
 --echo # Check that the above SELECT is blocked because of pending X lock.
 let $wait_condition=
 select count(*) = 1 from information_schema.processlist
-where state = "Waiting for table" and info = "select count(*) from t1";
+where state = "Waiting for table metadata lock" and
+      info = "select count(*) from t1";
 --source include/wait_condition.inc
 --echo # Unblock RENAME TABLE.
 commit;
@@ -1477,7 +1523,8 @@ connection mdl_con1;
 --echo # Check that RENAME TABLE is waiting with pending X lock.
 let $wait_condition=
 select count(*) = 1 from information_schema.processlist
-where state = "Waiting for table" and info = "rename table t1 to t2";
+where state = "Waiting for table metadata lock" and
+      info = "rename table t1 to t2";
 --source include/wait_condition.inc
 --echo # Check that SW is incompatible with pending X
 --echo # Sending:
@@ -1488,7 +1535,8 @@ connection mdl_con2;
 --echo # Check that the above DELETE is blocked because of pending X lock.
 let $wait_condition=
 select count(*) = 1 from information_schema.processlist
-where state = "Waiting for table" and info = "delete from t1 limit 1";
+where state = "Waiting for table metadata lock" and
+      info = "delete from t1 limit 1";
 --source include/wait_condition.inc
 --echo # Unblock RENAME TABLE.
 commit;
@@ -1521,7 +1569,8 @@ connection mdl_con1;
 --echo # Check that RENAME TABLE is waiting with pending X lock.
 let $wait_condition=
 select count(*) = 1 from information_schema.processlist
-where state = "Waiting for table" and info = "rename table t1 to t2";
+where state = "Waiting for table metadata lock" and
+      info = "rename table t1 to t2";
 --source include/wait_condition.inc
 --echo # Check that SNW is incompatible with pending X
 --echo # Sending:
@@ -1532,7 +1581,8 @@ connection mdl_con2;
 --echo # Check that the above ALTER TABLE is blocked because of pending X lock.
 let $wait_condition=
 select count(*) = 1 from information_schema.processlist
-where state = "Waiting for table" and info = "alter table t1 add primary key (c1)";
+where state = "Waiting for table metadata lock" and
+      info = "alter table t1 add primary key (c1)";
 --source include/wait_condition.inc
 --echo # Unblock RENAME TABLE.
 commit;
@@ -1565,7 +1615,8 @@ connection mdl_con1;
 --echo # Check that RENAME TABLE is waiting with pending X lock.
 let $wait_condition=
 select count(*) = 1 from information_schema.processlist
-where state = "Waiting for table" and info = "rename table t1 to t2";
+where state = "Waiting for table metadata lock" and
+      info = "rename table t1 to t2";
 --source include/wait_condition.inc
 --echo # Check that SNRW is incompatible with pending X
 --echo # Sending:
@@ -1576,7 +1627,8 @@ connection mdl_con3;
 --echo # Check that the above LOCK TABLES is blocked because of pending X lock.
 let $wait_condition=
 select count(*) = 1 from information_schema.processlist
-where state = "Waiting for table" and info = "lock table t1 write";
+where state = "Waiting for table metadata lock" and
+      info = "lock table t1 write";
 --source include/wait_condition.inc
 --echo # 
 --echo # Switching to connection 'mdl_con2'.
@@ -1642,7 +1694,8 @@ connection mdl_con2;
 --echo # Check that the above INSERT is blocked.
 let $wait_condition=
 select count(*) = 1 from information_schema.processlist
-where state = "Waiting for table" and info = "insert into t2 values (1)";
+where state = "Waiting for table metadata lock" and
+      info = "insert into t2 values (1)";
 --source include/wait_condition.inc
 --echo # Unblock ALTER TABLE and thus INSERT.
 set debug_sync= 'now SIGNAL finish';
@@ -1691,7 +1744,8 @@ connection mdl_con2;
 --echo # Check that the above INSERT is blocked.
 let $wait_condition=
 select count(*) = 1 from information_schema.processlist
-where state = "Waiting for table" and info = "insert into t1 values (1)";
+where state = "Waiting for table metadata lock" and
+      info = "insert into t1 values (1)";
 --source include/wait_condition.inc
 --echo # Unblock ALTER TABLE and thus INSERT.
 set debug_sync= 'now SIGNAL finish';
@@ -1726,7 +1780,8 @@ connection default;
 --echo # Wait until ALTER TABLE starts waiting for SNW lock.
 let $wait_condition=
 select count(*) = 1 from information_schema.processlist
-where state = "Waiting for table" and info = "alter table t1 add primary key (c1)";
+where state = "Waiting for table metadata lock" and
+      info = "alter table t1 add primary key (c1)";
 --source include/wait_condition.inc
 --echo # We should still be able to get both SW and SR locks without waiting.
 select count(*) from t1;
@@ -1769,7 +1824,8 @@ connection default;
 --echo # Wait until ALTER TABLE starts waiting X lock.
 let $wait_condition=
 select count(*) = 1 from information_schema.processlist
-where state = "Waiting for table" and info = "alter table t2 add column c2 int";
+where state = "Waiting for table metadata lock" and
+      info = "alter table t2 add column c2 int";
 --source include/wait_condition.inc
 --echo # Check that attempt to acquire SR lock on t2 causes waiting.
 --echo # Sending:
@@ -1780,7 +1836,8 @@ connection mdl_con2;
 --echo # Check that the above SELECT is blocked.
 let $wait_condition=
 select count(*) = 1 from information_schema.processlist
-where state = "Waiting for table" and info = "select count(*) from t2";
+where state = "Waiting for table metadata lock" and
+      info = "select count(*) from t2";
 --source include/wait_condition.inc
 --echo # Unblock ALTER TABLE.
 commit;
@@ -1817,7 +1874,8 @@ connection default;
 --echo # Wait until ALTER TABLE starts waiting X lock.
 let $wait_condition=
 select count(*) = 1 from information_schema.processlist
-where state = "Waiting for table" and info = "alter table t2 drop column c2";
+where state = "Waiting for table metadata lock" and
+      info = "alter table t2 drop column c2";
 --source include/wait_condition.inc
 --echo # Check that attempt to acquire SW lock on t2 causes waiting.
 --echo # Sending:
@@ -1828,7 +1886,8 @@ connection mdl_con2;
 --echo # Check that the above INSERT is blocked.
 let $wait_condition=
 select count(*) = 1 from information_schema.processlist
-where state = "Waiting for table" and info = "insert into t2 values (1)";
+where state = "Waiting for table metadata lock" and
+      info = "insert into t2 values (1)";
 --source include/wait_condition.inc
 --echo # Unblock ALTER TABLE.
 commit;
@@ -1861,7 +1920,8 @@ connection default;
 --echo # Wait until ALTER TABLE starts waiting X lock.
 let $wait_condition=
 select count(*) = 1 from information_schema.processlist
-where state = "Waiting for table" and info = "alter table t1 add column c2 int";
+where state = "Waiting for table metadata lock" and
+      info = "alter table t1 add column c2 int";
 --source include/wait_condition.inc
 --echo # Check that transaction is still able to acquire SR lock.
 select count(*) from t1;
@@ -1904,7 +1964,8 @@ connection mdl_con1;
 --echo # Check that the above SELECT is blocked 
 let $wait_condition=
 select count(*) = 1 from information_schema.processlist
-where state = "Waiting for table" and info = "select count(*) from t2";
+where state = "Waiting for table metadata lock" and
+      info = "select count(*) from t2";
 --source include/wait_condition.inc
 --echo # Unblock SELECT.
 unlock tables;
@@ -1934,7 +1995,8 @@ connection mdl_con1;
 --echo # Check that the above DELETE is blocked 
 let $wait_condition=
 select count(*) = 1 from information_schema.processlist
-where state = "Waiting for table" and info = "delete from t2 limit 1";
+where state = "Waiting for table metadata lock" and
+      info = "delete from t2 limit 1";
 --source include/wait_condition.inc
 --echo # Unblock DELETE.
 unlock tables;
@@ -1964,7 +2026,8 @@ connection default;
 --echo # Wait until LOCK TABLE is blocked creating pending request for X lock.
 let $wait_condition=
 select count(*) = 1 from information_schema.processlist
-where state = "Waiting for table" and info = "lock table t1 write";
+where state = "Waiting for table metadata lock" and
+      info = "lock table t1 write";
 --source include/wait_condition.inc
 --echo # Check that another instance of SR lock is granted without waiting.
 select count(*) from t1;
@@ -1999,7 +2062,8 @@ connection default;
 --echo # Wait until LOCK TABLE is blocked creating pending request for X lock.
 let $wait_condition=
 select count(*) = 1 from information_schema.processlist
-where state = "Waiting for table" and info = "lock table t1 write";
+where state = "Waiting for table metadata lock" and
+      info = "lock table t1 write";
 --source include/wait_condition.inc
 --echo # Check that both SR and SW locks are granted without waiting
 --echo # and errors.
@@ -2043,7 +2107,8 @@ connection default;
 --echo # Wait until RENAME TABLE starts waiting with pending X lock.
 let $wait_condition=
 select count(*) = 1 from information_schema.processlist
-where state = "Waiting for table" and info = "rename table t2 to t3";
+where state = "Waiting for table metadata lock" and
+      info = "rename table t2 to t3";
 --source include/wait_condition.inc
 --echo # Check that attempt to acquire SR lock on t2 causes waiting.
 --echo # Sending:
@@ -2054,7 +2119,8 @@ connection mdl_con2;
 --echo # Check that the above SELECT is blocked.
 let $wait_condition=
 select count(*) = 1 from information_schema.processlist
-where state = "Waiting for table" and info = "select count(*) from t2";
+where state = "Waiting for table metadata lock" and
+      info = "select count(*) from t2";
 --source include/wait_condition.inc
 --echo # Unblock RENAME TABLE.
 commit;
@@ -2093,7 +2159,8 @@ connection default;
 --echo # Wait until RENAME TABLE starts waiting with pending X lock.
 let $wait_condition=
 select count(*) = 1 from information_schema.processlist
-where state = "Waiting for table" and info = "rename table t2 to t3";
+where state = "Waiting for table metadata lock" and
+      info = "rename table t2 to t3";
 --source include/wait_condition.inc
 --echo # Check that attempt to acquire SW lock on t2 causes waiting.
 --echo # Sending:
@@ -2104,7 +2171,8 @@ connection mdl_con2;
 --echo # Check that the above DELETE is blocked.
 let $wait_condition=
 select count(*) = 1 from information_schema.processlist
-where state = "Waiting for table" and info = "delete from t2 limit 1";
+where state = "Waiting for table metadata lock" and
+      info = "delete from t2 limit 1";
 --source include/wait_condition.inc
 --echo # Unblock RENAME TABLE.
 commit;
@@ -2141,7 +2209,8 @@ connection default;
 --echo # Wait until RENAME TABLE is blocked creating pending request for X lock.
 let $wait_condition=
 select count(*) = 1 from information_schema.processlist
-where state = "Waiting for table" and info = "rename table t1 to t2";
+where state = "Waiting for table metadata lock" and
+      info = "rename table t1 to t2";
 --source include/wait_condition.inc
 --echo # Check that another instance of SR lock is granted without waiting.
 select count(*) from t1;
@@ -2176,7 +2245,8 @@ connection default;
 --echo # Wait until RENAME TABLE is blocked creating pending request for X lock.
 let $wait_condition=
 select count(*) = 1 from information_schema.processlist
-where state = "Waiting for table" and info = "rename table t1 to t2";
+where state = "Waiting for table metadata lock" and
+      info = "rename table t1 to t2";
 --source include/wait_condition.inc
 --echo # Check that both SR and SW locks are granted without waiting
 --echo # and errors.
@@ -2236,7 +2306,8 @@ connection handler_con2;
 --echo # Wait until ALTER is blocked during upgrade.
 let $wait_condition=
   select count(*) = 1 from information_schema.processlist
-  where state = "Waiting for table" and info = "alter table t1 add column j int";
+  where state = "Waiting for table metadata lock" and
+        info = "alter table t1 add column j int";
 --source include/wait_condition.inc
 --echo # 
 --echo # Switching to connection 'default'.
@@ -2279,7 +2350,8 @@ connection handler_con1;
 --echo # Wait until INSERT is blocked on table-level lock.
 let $wait_condition=
   select count(*) = 1 from information_schema.processlist
-  where state = "Table lock" and info = "insert into t2 values (1)";
+  where state = "Waiting for table level lock" and
+        info = "insert into t2 values (1)";
 --source include/wait_condition.inc
 --echo # Sending 'alter table t1 drop column j'. It should not cause
 --echo # deadlock.
@@ -2289,7 +2361,8 @@ connection handler_con2;
 --echo # Wait until ALTER is blocked during upgrade.
 let $wait_condition=
   select count(*) = 1 from information_schema.processlist
-  where state = "Waiting for table" and info = "alter table t1 drop column j";
+  where state = "Waiting for table metadata lock" and
+        info = "alter table t1 drop column j";
 --source include/wait_condition.inc
 --echo # 
 --echo # Switching to connection 'default'.
@@ -2328,7 +2401,8 @@ connection handler_con1;
 --echo # Wait until INSERT is blocked because of SNRW lock.
 let $wait_condition=
   select count(*) = 1 from information_schema.processlist
-  where state = "Waiting for table" and info = "insert into t1 values (1)";
+  where state = "Waiting for table metadata lock" 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:
@@ -2374,7 +2448,8 @@ connection handler_con1;
 --echo # Wait until INSERT is blocked because of SNRW lock.
 let $wait_condition=
   select count(*) = 1 from information_schema.processlist
-  where state = "Waiting for table" and info = "insert into t2 values (1)";
+  where state = "Waiting for table metadata lock" 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:
@@ -2451,7 +2526,8 @@ connection deadlock_con1;
 --echo # for 'deadlock_con2' which holds shared metadata lock on 't2'.
 let $wait_condition=
   select count(*) = 1 from information_schema.processlist
-  where state = "Waiting for table" and info = "rename table t2 to t0, t3 to t2, t0 to t3";
+  where state = "Waiting for table metadata lock" and
+        info = "rename table t2 to t0, t3 to t2, t0 to t3";
 --source include/wait_condition.inc
 --echo # The below statement should wait for exclusive metadata lock
 --echo # on 't2' to go away and should not produce ER_LOCK_DEADLOCK
@@ -2466,7 +2542,8 @@ connection deadlock_con2;
 --echo # for an exclusive metadata lock to go away.
 let $wait_condition=
   select count(*) = 1 from information_schema.processlist
-  where state = "Waiting for table" and info = "select * from t2";
+  where state = "Waiting for table metadata lock" and
+        info = "select * from t2";
 --source include/wait_condition.inc
 --echo #
 --echo # Unblock RENAME TABLE by releasing shared metadata lock on t2.
@@ -2502,7 +2579,8 @@ connection deadlock_con1;
 --echo # table 't1'.
 let $wait_condition=
   select count(*) = 1 from information_schema.processlist
-  where state = "Waiting for table" and info = "rename table t1 to t0, t3 to t1, t0 to t3";
+  where state = "Waiting for table metadata lock" and
+        info = "rename table t1 to t0, t3 to t1, t0 to t3";
 --source include/wait_condition.inc
 --echo # Commit transaction to unblock RENAME TABLE.
 commit;
@@ -2536,7 +2614,8 @@ connection deadlock_con1;
 --echo # for 'deadlock_con1' which holds shared metadata lock on 't2'.
 let $wait_condition=
   select count(*) = 1 from information_schema.processlist
-  where state = "Waiting for table" and info = "rename table t2 to t0, t1 to t2, t0 to t1";
+  where state = "Waiting for table metadata lock" and
+        info = "rename table t2 to t0, t1 to t2, t0 to t1";
 --source include/wait_condition.inc
 --echo # 
 --echo # The below statement should not wait as doing so will cause deadlock.
@@ -2549,7 +2628,8 @@ select * from t1;
 --echo # metadata lock on table 't1', i.e. that RENAME TABLE is still blocked.
 let $wait_condition=
   select count(*) = 1 from information_schema.processlist
-  where state = "Waiting for table" and info = "rename table t2 to t0, t1 to t2, t0 to t1";
+  where state = "Waiting for table metadata lock" and
+        info = "rename table t2 to t0, t1 to t2, t0 to t1";
 --source include/wait_condition.inc
 --echo # Commit transaction to unblock RENAME TABLE.
 commit;
@@ -2590,7 +2670,7 @@ connection deadlock_con2;
 --echo # for an UNRW metadata lock to go away.
 let $wait_condition=
   select count(*) = 1 from information_schema.processlist
-  where state = "Waiting for table" and info = "select * from t1";
+  where state = "Waiting for table metadata lock" and info = "select * from t1";
 --source include/wait_condition.inc
 
 --echo # Send RENAME TABLE statement that will deadlock with the
@@ -2604,7 +2684,8 @@ connection default;
 --echo # pending X lock on t1.
 let $wait_condition=
   select count(*) = 1 from information_schema.processlist
-  where state = "Waiting for table" and info = "rename table t1 to t0, t2 to t1, t0 to t2";
+  where state = "Waiting for table metadata lock" and
+        info = "rename table t1 to t0, t2 to t1, t0 to t2";
 --source include/wait_condition.inc
 --echo # Allow the above RENAME TABLE to acquire lock on t1 and
 --echo # create pending lock on t2 thus creating deadlock.
@@ -2626,7 +2707,8 @@ connection deadlock_con1;
 --echo # is blocked.
 let $wait_condition=
   select count(*) = 1 from information_schema.processlist
-  where state = "Waiting for table" and info = "rename table t1 to t0, t2 to t1, t0 to t2";
+  where state = "Waiting for table metadata lock" and
+        info = "rename table t1 to t0, t2 to t1, t0 to t2";
 --source include/wait_condition.inc
 --echo # Commit transaction to unblock this RENAME TABLE.
 commit;
@@ -2674,7 +2756,8 @@ connection deadlock_con1;
 --echo # 'deadlock_con1' which holds shared lock on 't1'.
 let $wait_condition=
   select count(*) = 1 from information_schema.processlist
-  where state = "Waiting for table" and info = "alter table t1 add column j int, rename to t2";
+  where state = "Waiting for table metadata lock" and
+        info = "alter table t1 add column j int, rename to t2";
 --source include/wait_condition.inc
 
 --echo # The below statement should not wait as it will cause deadlock.
@@ -2687,7 +2770,8 @@ select * from t2;
 --echo # so ALTER TABLE ... RENAME is still blocked.
 let $wait_condition=
   select count(*) = 1 from information_schema.processlist
-  where state = "Waiting for table" and info = "alter table t1 add column j int, rename to t2";
+  where state = "Waiting for table metadata lock" and
+        info = "alter table t1 add column j int, rename to t2";
 --source include/wait_condition.inc
 
 --echo # Commit transaction to unblock ALTER TABLE ... RENAME.
@@ -2732,7 +2816,8 @@ connection deadlock_con2;
 --echo # while trying to acquire SNRW lock on 't1'.
 let $wait_condition=
   select count(*) = 1 from information_schema.processlist
-  where state = "Waiting for table" and info = "lock tables t1 write, t2 write";
+  where state = "Waiting for table metadata lock" and
+        info = "lock tables t1 write, t2 write";
 --source include/wait_condition.inc
 --echo # Resume SELECT execution, this should eventually unblock LOCK TABLES.
 set debug_sync= 'now SIGNAL finish';
@@ -2801,7 +2886,8 @@ connection deadlock_con2;
 --echo # Wait until ALTER is blocked.
 let $wait_condition=
   select count(*) = 1 from information_schema.processlist
-  where state = "Waiting for table" and info = "alter table t1 drop column j";
+  where state = "Waiting for table metadata lock" and
+        info = "alter table t1 drop column j";
 --source include/wait_condition.inc
 --echo # Resume INSERT so it can start deadlock detection.
 --echo #
@@ -2873,7 +2959,7 @@ connection default;
 --echo # metadata lock on its tables and blocks due to 't4' being used by LOCK
 --echo # TABLES.
 let $wait_condition= select count(*)= 1 from information_schema.processlist
-                       where state= 'Waiting for table' and
+                       where state= 'Waiting for table metadata lock' and
                              info='rename table t3 to t5, t4 to t3';
 --source include/wait_condition.inc
 --echo # Send :
@@ -2884,7 +2970,7 @@ connection con1root;
 --echo # Wait until INSERT statement waits due to encountering pending
 --echo # exclusive metadata lock on 't3'.
 let $wait_condition= select count(*)= 1 from information_schema.processlist
-                       where state= 'Waiting for table' and
+                       where state= 'Waiting for table metadata lock' and
                              info='insert into t1 values (1)';
 --source include/wait_condition.inc
 unlock tables;
@@ -3026,7 +3112,8 @@ connection default;
 --echo # Waiting until CREATE TABLE ... SELECT ... is blocked.
 let $wait_condition=
   select count(*) = 1 from information_schema.processlist
-  where state = "Table lock" and info = "create table t2 select * from t1 for update";
+  where state = "Waiting for table level lock" and
+        info = "create table t2 select * from t1 for update";
 --source include/wait_condition.inc
 
 --echo # First let us check that SHOW FIELDS/DESCRIBE doesn't
@@ -3079,7 +3166,8 @@ connection default;
 --echo # Waiting until CREATE TABLE ... SELECT ... is blocked.
 let $wait_condition=
   select count(*) = 1 from information_schema.processlist
-  where state = "Table lock" and info = "create table t2 select * from t1 for update";
+  where state = "Waiting for table level lock" and
+        info = "create table t2 select * from t1 for update";
 --source include/wait_condition.inc
 
 --echo # Let us check that SHOW FIELDS/DESCRIBE gets blocked.
@@ -3091,7 +3179,8 @@ connection con46044_2;
 --echo # Wait until SHOW FIELDS gets blocked.
 let $wait_condition=
   select count(*) = 1 from information_schema.processlist
-  where state = "Waiting for table" and info = "show fields from t2";
+  where state = "Waiting for table metadata lock" and
+        info = "show fields from t2";
 --source include/wait_condition.inc
 
 unlock tables;
@@ -3121,7 +3210,8 @@ connection default;
 --echo # Waiting until CREATE TABLE ... SELECT ... is blocked.
 let $wait_condition=
   select count(*) = 1 from information_schema.processlist
-  where state = "Table lock" and info = "create table t2 select * from t1 for update";
+  where state = "Waiting for table level lock" and
+        info = "create table t2 select * from t1 for update";
 --source include/wait_condition.inc
 
 --echo # Check that I_S query which reads only .FRMs gets blocked.
@@ -3133,7 +3223,7 @@ connection con46044_2;
 --echo # Wait until SELECT COLUMN_NAME FROM I_S.COLUMNS  gets blocked.
 let $wait_condition=
   select count(*) = 1 from information_schema.processlist
-  where state = "Waiting for table" and
+  where state = "Waiting for table metadata lock" and
         info like "select column_name from information_schema.columns%";
 --source include/wait_condition.inc
 
@@ -3164,7 +3254,8 @@ connection default;
 --echo # Waiting until CREATE TABLE ... SELECT ... is blocked.
 let $wait_condition=
   select count(*) = 1 from information_schema.processlist
-  where state = "Table lock" and info = "create table t2 select * from t1 for update";
+  where state = "Waiting for table level lock" and
+        info = "create table t2 select * from t1 for update";
 --source include/wait_condition.inc
 
 --echo # Finally, check that I_S query which does full-blown table open
@@ -3177,7 +3268,7 @@ connection con46044_2;
 --echo # Wait until SELECT ... FROM I_S.TABLES gets blocked.
 let $wait_condition=
   select count(*) = 1 from information_schema.processlist
-  where state = "Waiting for table" and
+  where state = "Waiting for table metadata lock" and
         info like "select table_name, table_type, auto_increment, table_comment from information_schema.tables%";
 --source include/wait_condition.inc
 
@@ -3240,7 +3331,8 @@ update t1 set c3=c3+1 where c2 = 3;
 --echo # metadata lock on table 't1', i.e. that ALTER TABLE is still blocked.
 let $wait_condition=
   select count(*) = 1 from information_schema.processlist
-  where state = "Waiting for table" and info = "alter table t1 add column e int, rename to t2";
+  where state = "Waiting for table metadata lock" and
+        info = "alter table t1 add column e int, rename to t2";
 --source include/wait_condition.inc
 
 --echo # Unblock ALTER TABLE by commiting transaction and thus releasing
@@ -3425,7 +3517,7 @@ connection con1;
 connection con3;
 let $wait_condition=
   SELECT COUNT(*) = 1 FROM information_schema.processlist
-  WHERE state = "Table lock" and info = "SELECT 1";
+  WHERE state = "Waiting for table level lock" and info = "SELECT 1";
 --source include/wait_condition.inc
 # The ALTER below will try to abort the statement in connection con1,
 # since the latter waits on a table-level lock while having a HANDLER
@@ -3495,7 +3587,8 @@ connection con50913_2;
 --echo # Wait until TRUNCATE TABLE is blocked on MDL lock.
 let $wait_condition=
   select count(*) = 1 from information_schema.processlist
-  where state = "Waiting for table" and info = "truncate table t1";
+  where state = "Waiting for table metadata lock" and
+        info = "truncate table t1";
 --source include/wait_condition.inc
 --echo # Unblock ALTER TABLE.
 set debug_sync= 'now SIGNAL go';
@@ -3568,7 +3661,8 @@ connection con3;
 --echo # SW lock on the table.
 let $wait_condition=
   select count(*) = 2 from information_schema.processlist
-  where state = "Waiting for table" and info = "insert into t1 values (1)";
+  where state = "Waiting for table metadata lock" and
+        info = "insert into t1 values (1)";
 --source include/wait_condition.inc
 --echo # Unblock ALTER TABLE. Since it will try to upgrade SNW to X lock
 --echo # deadlock with two loops in waiting graph will occur. Both loops
@@ -3738,7 +3832,7 @@ SET DEBUG_SYNC= 'now WAIT_FOR locked';
 --echo # Connection con3
 connection con3;
 let $wait_condition=SELECT COUNT(*)=1 FROM information_schema.processlist
-  WHERE state='Waiting for table' AND info='CREATE DATABASE db1';
+  WHERE state='Waiting for schema metadata lock' AND info='CREATE DATABASE db1';
 --source include/wait_condition.inc
 # This should not block.
 CREATE DATABASE db2;
@@ -3778,7 +3872,7 @@ SET DEBUG_SYNC= 'now WAIT_FOR locked';
 --echo # Connection con3
 connection con3;
 let $wait_condition=SELECT COUNT(*)=1 FROM information_schema.processlist
-  WHERE state='Waiting for table'
+  WHERE state='Waiting for schema metadata lock'
   AND info='ALTER DATABASE db1 DEFAULT CHARACTER SET utf8';
 --source include/wait_condition.inc
 # This should not block.
@@ -3813,7 +3907,7 @@ SET DEBUG_SYNC= 'now WAIT_FOR locked';
 --echo # Connection con3
 connection con3;
 let $wait_condition=SELECT COUNT(*)=1 FROM information_schema.processlist
-  WHERE state='Waiting for table' AND info='DROP DATABASE db1';
+  WHERE state='Waiting for schema metadata lock' AND info='DROP DATABASE db1';
 --source include/wait_condition.inc
 SET DEBUG_SYNC= 'now SIGNAL blocked';
 
@@ -3857,7 +3951,7 @@ SET DEBUG_SYNC= 'now WAIT_FOR locked';
 --echo # Connection con3
 connection con3;
 let $wait_condition=SELECT COUNT(*)=1 FROM information_schema.processlist
-  WHERE state='Waiting for table'
+  WHERE state='Waiting for schema metadata lock'
   AND info='ALTER DATABASE `#mysql50#a-b-c` UPGRADE DATA DIRECTORY NAME';
 --source include/wait_condition.inc
 # This should not block.
@@ -3898,7 +3992,7 @@ SET DEBUG_SYNC= 'now WAIT_FOR locked';
 --echo # Connection con3
 connection con3;
 let $wait_condition=SELECT COUNT(*)=1 FROM information_schema.processlist
-  WHERE state='Waiting for table' AND info='DROP DATABASE db1';
+  WHERE state='Waiting for schema metadata lock' AND info='DROP DATABASE db1';
 --source include/wait_condition.inc
 # This should not block.
 CREATE DATABASE db2;
@@ -3934,7 +4028,7 @@ SET DEBUG_SYNC= 'now WAIT_FOR locked';
 --echo # Connection con3
 connection con3;
 let $wait_condition=SELECT COUNT(*)=1 FROM information_schema.processlist
-  WHERE state='Waiting for table'
+  WHERE state='Waiting for schema metadata lock'
   AND info='ALTER DATABASE db1 DEFAULT CHARACTER SET utf8';
 --source include/wait_condition.inc
 SET DEBUG_SYNC= 'now SIGNAL blocked';
@@ -3973,7 +4067,8 @@ SET DEBUG_SYNC= 'now WAIT_FOR locked';
 --echo # Connection con3
 connection con3;
 let $wait_condition=SELECT COUNT(*)=1 FROM information_schema.processlist
-  WHERE state='Waiting for table' AND info='CREATE TABLE db1.t1 (a INT)';
+  WHERE state='Waiting for schema metadata lock' AND
+        info='CREATE TABLE db1.t1 (a INT)';
 --source include/wait_condition.inc
 SET DEBUG_SYNC= 'now SIGNAL blocked';
 
@@ -4011,7 +4106,8 @@ SET DEBUG_SYNC= 'now WAIT_FOR locked';
 --echo # Connection con3
 connection con3;
 let $wait_condition=SELECT COUNT(*)=1 FROM information_schema.processlist
-  WHERE state='Waiting for table' AND info='RENAME TABLE db1.t1 TO test.t1';
+  WHERE state='Waiting for schema metadata lock' AND
+        info='RENAME TABLE db1.t1 TO test.t1';
 --source include/wait_condition.inc
 SET DEBUG_SYNC= 'now SIGNAL blocked';
 
@@ -4044,7 +4140,8 @@ SET DEBUG_SYNC= 'now WAIT_FOR locked';
 --echo # Connection con3
 connection con3;
 let $wait_condition=SELECT COUNT(*)=1 FROM information_schema.processlist
-  WHERE state='Waiting for table' AND info='RENAME TABLE test.t2 TO db1.t2';
+  WHERE state='Waiting for schema metadata lock' AND
+        info='RENAME TABLE test.t2 TO db1.t2';
 --source include/wait_condition.inc
 SET DEBUG_SYNC= 'now SIGNAL blocked';
 
@@ -4084,7 +4181,7 @@ SET DEBUG_SYNC= 'now WAIT_FOR locked';
 --echo # Connection con3
 connection con3;
 let $wait_condition=SELECT COUNT(*)=1 FROM information_schema.processlist
-  WHERE state='Waiting for table' AND info='DROP TABLE db1.t1';
+  WHERE state='Waiting for schema metadata lock' AND info='DROP TABLE db1.t1';
 --source include/wait_condition.inc
 SET DEBUG_SYNC= 'now SIGNAL blocked';