bk commit into 6.0 tree (davi:1.2531) BUG#34311

[Davi Arnaut]

Below is the list of changes that have just been committed into a local
6.0 repository of davi.  When davi does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-02-06 09:50:51-02:00, davi@stripped +1 -0
  Bug#34311 main.lock_multi.test fails
  
  Rename thread state description for waiting a table lock.

  mysql-test/t/lock_multi.test@stripped, 2008-02-06 09:50:48-02:00, davi@stripped +1 -1
    Rename state description for table lock.

diff -Nrup a/mysql-test/t/lock_multi.test b/mysql-test/t/lock_multi.test
--- a/mysql-test/t/lock_multi.test	2008-02-06 09:43:53 -02:00
+++ b/mysql-test/t/lock_multi.test	2008-02-06 09:50:48 -02:00
@@ -456,7 +456,7 @@ connection waiter;
 connection default;
 let $wait_condition=
   select count(*) = 1 from information_schema.processlist
-  where state = "Locked" and info = "insert into t1 values(1)";
+  where state = "Table Lock" and info = "insert into t1 values(1)";
 --source include/wait_condition.inc
 let $tlwb= `show status like 'Table_locks_waited'`;
 unlock tables;