commit into mysql-6.0 branch (davi:2659)

[Davi Arnaut]

#At file:///home/davi/bzr/work/17954-6.0/

 2659 Davi Arnaut	2008-05-26
      Fix for test failure. The problem was that the VARIABLE_VALUE
      column is of string type, which causes the test to fail since
      it expects a integer comparison to take place.
modified:
  mysql-test/r/status.result
  mysql-test/t/status.test

per-file comments:
  mysql-test/r/status.result
    Update test case result.
  mysql-test/t/status.test
    Use a view to automatically cast the value to integer.

=== modified file 'mysql-test/r/status.result'
--- a/mysql-test/r/status.result	2008-05-21 20:25:45 +0000
+++ b/mysql-test/r/status.result	2008-05-26 22:17:26 +0000
@@ -180,12 +180,15 @@
 Com_alter_function	0
 Com_create_function	1
 Com_drop_function	1
-SELECT VARIABLE_VALUE INTO @tc FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME
= 'Threads_connected';
-SELECT VARIABLE_NAME FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME =
'Threads_created' AND VARIABLE_VALUE < @tc;
-VARIABLE_NAME
-SELECT VARIABLE_VALUE INTO @tr FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME
= 'Threads_running';
+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 VALUE INTO @tr FROM v1 WHERE NAME = 'Threads_running';
 FLUSH STATUS;
-SELECT * FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'Threads_connected'
AND VARIABLE_VALUE < @tc;
-VARIABLE_NAME	VARIABLE_VALUE
-SELECT * FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'Threads_running'
AND VARIABLE_VALUE < @tr;
-VARIABLE_NAME	VARIABLE_VALUE
+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;

=== modified file 'mysql-test/t/status.test'
--- a/mysql-test/t/status.test	2008-05-21 20:25:45 +0000
+++ b/mysql-test/t/status.test	2008-05-26 22:17:26 +0000
@@ -267,9 +267,15 @@
 # Bug #17954: Threads_connected > Threads_created
 #
 
-SELECT VARIABLE_VALUE INTO @tc FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME
= 'Threads_connected';
-SELECT VARIABLE_NAME FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME =
'Threads_created' AND VARIABLE_VALUE < @tc;
-SELECT VARIABLE_VALUE INTO @tr FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME
= 'Threads_running';
+--disable_warnings
+DROP VIEW IF EXISTS v1;
+--enable_warnings
+
+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;
+SELECT VALUE INTO @tr FROM v1 WHERE NAME = 'Threads_running';
 FLUSH STATUS;
-SELECT * FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'Threads_connected'
AND VARIABLE_VALUE < @tc;
-SELECT * FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'Threads_running'
AND VARIABLE_VALUE < @tr;
+SELECT * FROM v1 WHERE NAME = 'Threads_connected' AND VALUE < @tc;
+SELECT * FROM v1 WHERE NAME = 'Threads_running' AND VALUE < @tr;
+DROP VIEW v1;