bk commit into 5.1 tree (thek:1.2629) BUG#32966

[kpettersson]

Below is the list of changes that have just been committed into a local
5.1 repository of thek.  When thek 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, 2008-05-13 14:49:04+02:00, thek@adventure.(none) +2 -0
  Bug#32966 main.status fails
  
  FLUSH STATUS doesn't clear the values of the global status variables.
  The test case is reduced to testing session local Com-variables until
  FLUSH GLOBAL STATUS is implemented.

  mysql-test/r/status.result@stripped, 2008-05-13 14:49:02+02:00, thek@adventure.(none) +3 -2
    Reduce test to testing session status until 'FLUSH GLOBAL STATUS' is
    implemented.

  mysql-test/t/status.test@stripped, 2008-05-13 14:49:02+02:00, thek@adventure.(none) +3 -3
    Reduce test to testing session status until 'FLUSH GLOBAL STATUS' is
    implemented.

diff -Nrup a/mysql-test/r/status.result b/mysql-test/r/status.result
--- a/mysql-test/r/status.result	2007-12-19 01:27:12 +01:00
+++ b/mysql-test/r/status.result	2008-05-13 14:49:02 +02:00
@@ -162,7 +162,8 @@ Variable_name	Value
 Com_show_status	8
 rnd_diff	tmp_table_diff
 20	8
-show global status like 'Com%function%';
+flush status;
+show status like 'Com%function%';
 Variable_name	Value
 Com_alter_function	0
 Com_create_function	0
@@ -176,7 +177,7 @@ set ret = x * 10;
 return ret;
 end //
 drop function f1;
-show global status like 'Com%function%';
+show status like 'Com%function%';
 Variable_name	Value
 Com_alter_function	0
 Com_create_function	1
diff -Nrup a/mysql-test/t/status.test b/mysql-test/t/status.test
--- a/mysql-test/t/status.test	2007-12-15 00:27:25 +01:00
+++ b/mysql-test/t/status.test	2008-05-13 14:49:02 +02:00
@@ -245,7 +245,8 @@ eval select substring_index('$rnd_next2'
 # 
 # Bug#30252 Com_create_function is not incremented.
 #
-show global status like 'Com%function%';
+flush status;
+show status like 'Com%function%';
 
 DELIMITER //;
 create function f1 (x INTEGER) returns integer
@@ -257,8 +258,7 @@ create function f1 (x INTEGER) returns i
 DELIMITER ;//
 
 drop function f1;
-
-show global status like 'Com%function%';
+show status like 'Com%function%';
 
 
 # End of 5.1 tests