bzr push into mysql-6.0-bugteam branch (davi:2987)

[Davi Arnaut]

 2987 Davi Arnaut	2009-01-29 [merge]
      Merge from upstream 6.0-bugteam
added:
  mysql-test/suite/binlog/r/binlog_tmp_table.result
  mysql-test/suite/binlog/t/binlog_tmp_table.test
modified:
  mysql-test/lib/mtr_report.pl
  mysql-test/r/subselect.result
  mysql-test/r/subselect3.result
  mysql-test/r/subselect3_jcl6.result
  mysql-test/r/subselect_no_mat.result
  mysql-test/r/subselect_no_opts.result
  mysql-test/r/subselect_no_semijoin.result
  mysql-test/t/subselect.test
  mysql-test/t/subselect3.test
  mysql-test/t/user_limits.test
  sql/item_cmpfunc.cc
  sql/sql_delete.cc
  sql/sql_select.cc
  sql/sql_table.cc

=== modified file 'mysql-test/r/status.result'
--- a/mysql-test/r/status.result	2009-01-06 10:38:47 +0000
+++ b/mysql-test/r/status.result	2009-01-29 16:33:46 +0000
@@ -239,12 +239,6 @@ CREATE VIEW v1 AS SELECT VARIABLE_NAME A
 SELECT VALUE INTO @tc FROM v1 WHERE NAME = 'Threads_connected';
 SELECT NAME FROM v1 WHERE NAME = 'Threads_created' AND VALUE < @tc;
 NAME
-SELECT VALUE INTO @tr FROM v1 WHERE NAME = 'Threads_running';
-FLUSH STATUS;
-SELECT * FROM v1 WHERE NAME = 'Threads_connected' AND VALUE < @tc;
-NAME	VALUE
-SELECT * FROM v1 WHERE NAME = 'Threads_running' AND VALUE < @tr;
-NAME	VALUE
 DROP VIEW v1;
 SELECT VARIABLE_NAME FROM INFORMATION_SCHEMA.GLOBAL_STATUS
 WHERE VARIABLE_NAME = 'Threads_created' AND

=== modified file 'mysql-test/t/status.test'
--- a/mysql-test/t/status.test	2009-01-06 10:38:47 +0000
+++ b/mysql-test/t/status.test	2009-01-29 16:33:46 +0000
@@ -343,12 +343,6 @@ CREATE VIEW v1 AS SELECT VARIABLE_NAME A
 
 SELECT VALUE INTO @tc FROM v1 WHERE NAME = 'Threads_connected';
 SELECT NAME FROM v1 WHERE NAME = 'Threads_created' AND VALUE < @tc;
-SELECT VALUE INTO @tr FROM v1 WHERE NAME = 'Threads_running';
-
-FLUSH STATUS;
-
-SELECT * FROM v1 WHERE NAME = 'Threads_connected' AND VALUE < @tc;
-SELECT * FROM v1 WHERE NAME = 'Threads_running' AND VALUE < @tr;
 
 DROP VIEW v1;