bk commit into 5.1 tree (jani:1.2567)

[jani]

Below is the list of changes that have just been committed into a local
5.1 repository of jani. When jani 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-22 16:18:27+03:00, jani@stripped +2 -0
  Removed a test which output may differ depending on machine load.

  mysql-test/r/status.result@stripped, 2007-08-22 16:18:24+03:00, jani@stripped +0 -2
    Removed a test which output may differ depending on machine load.

  mysql-test/t/status.test@stripped, 2007-08-22 16:18:24+03:00, jani@stripped +0 -4
    Removed a test which output may differ depending on machine load.

diff -Nrup a/mysql-test/r/status.result b/mysql-test/r/status.result
--- a/mysql-test/r/status.result	2007-08-21 19:03:24 +03:00
+++ b/mysql-test/r/status.result	2007-08-22 16:18:24 +03:00
@@ -19,8 +19,6 @@ unlock tables;
 show status like 'Table_locks_waited';
 Variable_name	Value
 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-21 19:03:24 +03:00
+++ b/mysql-test/t/status.test	2007-08-22 16:18:24 +03:00
@@ -59,10 +59,6 @@ connection con1;
 reap;
 # ++Immediate = 16 + $wait_condition_reps
 show status like 'Table_locks_waited';
-# ++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;