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, 7 insertions, 5 deletions

diff --git a/mysql-test/t/innodb_mysql_lock.test b/mysql-test/t/innodb_mysql_lock.test
index c8ece729b19..975444a44b1 100644
--- a/mysql-test/t/innodb_mysql_lock.test
+++ b/mysql-test/t/innodb_mysql_lock.test
@@ -42,7 +42,7 @@ let $wait_condition=
 let $wait_condition=
   SELECT COUNT(*) = 1 FROM information_schema.processlist
   WHERE info = "DROP TABLE t1" and 
-  state = "Waiting for table";
+  state = "Waiting for table metadata lock";
 --source include/wait_condition.inc
 --echo # Connection 1 is now holding the lock.
 --echo # Issuing insert from connection 1 while connection 2&3 
@@ -97,7 +97,8 @@ connection default;
 --echo # connection holds SW metadata lock on table to be altered.
 let $wait_condition=
   select count(*) = 1 from information_schema.processlist
-  where state = "Waiting for table" and info = "alter table t1 add column c4 int";
+  where state = "Waiting for table metadata lock" and
+        info = "alter table t1 add column c4 int";
 --source include/wait_condition.inc
 
 --echo # The below statement should succeed. It should not
@@ -196,7 +197,7 @@ connection default;
 --echo # Connection con1
 connection con1;
 let $wait_condition=SELECT COUNT(*)=1 FROM information_schema.processlist
-  WHERE state='Waiting for table' AND info='OPTIMIZE TABLE t1';
+  WHERE state='Waiting for table metadata lock' AND info='OPTIMIZE TABLE t1';
 --source include/wait_condition.inc
 SELECT * FROM t1;
 COMMIT;
@@ -241,7 +242,7 @@ connection con2;
 --echo # Waiting for 'SELECT * FROM v1' to sync in.
 let $wait_condition=
   SELECT COUNT(*) = 1 FROM information_schema.processlist
-  WHERE state = "Waiting for table" AND info = "SELECT * FROM v1";
+  WHERE state = "Waiting for table metadata lock" AND info = "SELECT * FROM v1";
 --source include/wait_condition.inc
 # This should block due to v1 being locked.
 --echo # Sending:
@@ -252,7 +253,8 @@ connection con3;
 --echo # Waiting for 'ALTER VIEW v1 AS SELECT 2 FROM t2' to sync in.
 let $wait_condition=
   SELECT COUNT(*) = 1 FROM information_schema.processlist
-  WHERE state = "Waiting for table" AND info = "ALTER VIEW v1 AS SELECT 2 FROM t2";
+  WHERE state = "Waiting for table metadata lock" AND
+        info = "ALTER VIEW v1 AS SELECT 2 FROM t2";
 --source include/wait_condition.inc
 # Unlock t1 allowing SELECT * FROM v1 to proceed.
 UNLOCK TABLES;