Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime

into  mysql.com:/Users/davi/mysql/mysql-5.1-runtime

mysql-test/r/lock_multi.result

@@ -147,12 +147,10 @@ drop table if exists t1,t2;
 create table t1 (a int);
 flush status;
 lock tables t1 read;
-show status like 'Table_locks_waited';
-Variable_name	Value
-Table_locks_waited	0
 insert into t1 values(1);;
+unlock tables;
 drop table t1;
-show status like 'Table_locks_waited';
-Variable_name	Value
-Table_locks_waited	1
+select @tlwa < @tlwb;
+@tlwa < @tlwb
+1
 End of 5.1 tests

mysql-test/t/lock_multi.test

@@ -450,7 +450,7 @@ drop table if exists t1,t2;
 create table t1 (a int);
 flush status;
 lock tables t1 read;
-show status like 'Table_locks_waited';
+let $tlwa= `show status like 'Table_locks_waited'`;
 connect (waiter,localhost,root,,);
 connection waiter;
 --send insert into t1 values(1);
@@ -459,9 +459,15 @@ let $wait_condition=
   select count(*) = 1 from information_schema.processlist
   where state = "Locked" and info = "insert into t1 values(1)";
 --source include/wait_condition.inc
+let $tlwb= `show status like 'Table_locks_waited'`;
+unlock tables;
 drop table t1;
 disconnect waiter;
 connection default;
-show status like 'Table_locks_waited';
+--disable_query_log
+eval SET @tlwa= SUBSTRING_INDEX('$tlwa', '	', -1);
+eval SET @tlwb= SUBSTRING_INDEX('$tlwb', '	', -1);
+--enable_query_log
+select @tlwa < @tlwb;
 
 --echo End of 5.1 tests