bzr commit into mysql-6.0-rpl branch (aelkin:2803) Bug#37481

[Andrei Elkin]

#At file:///home/andrei/MySQL/BZR/mysql-6.0-rpl/ based on
revid:mats@stripped

 2803 Andrei Elkin	2009-01-29
      Bug #37481  main.status fails randomly
      
      An alternative patch.
modified:
  mysql-test/r/status.result
  mysql-test/t/status.test

per-file messages:
  mysql-test/t/status.test
    Correcting Bug #17954: Threads_connected > Threads_created regression test to
    prove two invariants:
     connected threads less than created
     running threads less than connected
=== modified file 'mysql-test/r/status.result'
--- a/mysql-test/r/status.result	2009-01-26 16:32:29 +0000
+++ b/mysql-test/r/status.result	2009-01-29 15:54:30 +0000
@@ -239,14 +239,14 @@ DROP FUNCTION f1;
 DROP VIEW IF EXISTS v1;
 CREATE VIEW v1 AS SELECT VARIABLE_NAME AS NAME, CONVERT(VARIABLE_VALUE, UNSIGNED) AS
VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS;
 SELECT VALUE INTO @tc FROM v1 WHERE NAME = 'Threads_connected';
-SELECT NAME FROM v1 WHERE NAME = 'Threads_created' AND VALUE < @tc;
-NAME
+SELECT count(*) as zero FROM v1 WHERE NAME = 'Threads_created' AND VALUE < @tc;
+zero
+0
 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
+SELECT count(*) as zero FROM v1 WHERE NAME = 'Threads_running' AND VALUE < @tc;
+zero
+0
 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-26 16:32:29 +0000
+++ b/mysql-test/t/status.test	2009-01-29 15:54:30 +0000
@@ -346,13 +346,14 @@ DROP VIEW IF EXISTS v1;
 CREATE VIEW v1 AS SELECT VARIABLE_NAME AS NAME, CONVERT(VARIABLE_VALUE, UNSIGNED) AS
VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS;
 
 SELECT VALUE INTO @tc FROM v1 WHERE NAME = 'Threads_connected';
-SELECT NAME FROM v1 WHERE NAME = 'Threads_created' AND VALUE < @tc;
+#connected threads less than created
+SELECT count(*) as zero 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;
+# running threads less than connected
+SELECT count(*) as zero FROM v1 WHERE NAME = 'Threads_running' AND VALUE < @tc;
 
 DROP VIEW v1;