bk commit into 5.1 tree (tsmith:1.2564) BUG#29307

[tim]

Below is the list of changes that have just been committed into a local
5.1 repository of tsmith. When tsmith 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, 2007-08-18 02:28:08-06:00, tsmith@stripped +2 -0
  Bug #29307: status.test fails with different Table_locks_immediate
  
  Finish premature patch which was accidentally pushed; remove debugging
  info and correct the test.

  mysql-test/r/status.result@stripped, 2007-08-18 02:28:06-06:00, tsmith@stripped +3
-6
    Correct test results

  mysql-test/t/status.test@stripped, 2007-08-18 02:28:06-06:00, tsmith@stripped +7
-5
    Disable query log for one statement, and correct some comments

diff -Nrup a/mysql-test/r/status.result b/mysql-test/r/status.result
--- a/mysql-test/r/status.result	2007-07-26 21:45:32 -06:00
+++ b/mysql-test/r/status.result	2007-08-18 02:28:06 -06:00
@@ -16,14 +16,11 @@ unlock tables;
 lock tables t1 read;
 update t1 set n = 3;
 unlock tables;
-show status like 'Table_lock%';
+show status like 'Table_locks_waited';
 Variable_name	Value
-Table_locks_immediate	17
 Table_locks_waited	1
-select * from information_schema.session_status where variable_name like 'Table_lock%';
-VARIABLE_NAME	VARIABLE_VALUE
-TABLE_LOCKS_IMMEDIATE	18
-TABLE_LOCKS_WAITED	1
+Immediate
+17
 drop table t1;
 select 1;
 1
diff -Nrup a/mysql-test/t/status.test b/mysql-test/t/status.test
--- a/mysql-test/t/status.test	2007-08-17 19:29:06 -06:00
+++ b/mysql-test/t/status.test	2007-08-18 02:28:06 -06:00
@@ -49,18 +49,20 @@ update t1 set n = 3;
 connection con2;
 # wait for the other query to start executing
 let $wait_condition= select 1 from INFORMATION_SCHEMA.PROCESSLIST where ID = $ID and
STATE = "Locked";
-# ++Immediate = 15 + $wait_condition_reps (wait_condition.inc does one select
-# in addition to the wait condition)
+# Immediate = 14 + $wait_condition_reps ($wait_timeout is 0, so no extra select
+# is done inside wait_condition.inc)
 --source include/wait_condition.inc
-# ++Immediate = 16 + $wait_condition_reps
+# ++Immediate = 15 + $wait_condition_reps
 unlock tables;
 
 connection con1;
 reap;
-# ++Immediate = 17 + $wait_condition_reps
+# ++Immediate = 16 + $wait_condition_reps
 show status like 'Table_locks_waited';
-# ++Immediate = 18 + $wait_condition_reps
+# ++Immediate = 17 + $wait_condition_reps
+--disable_query_log
 eval select variable_value - $wait_condition_reps as Immediate from
information_schema.session_status where variable_name like 'Table_locks_immediate';
+--enable_query_log
 drop table t1;
 
 disconnect con2;