bzr commit into mysql-5.1 branch (jonas:2656)

[jonas]

#At file:///home/jonas/src/telco-6.3/

 2656 jonas@stripped	2008-08-10 [merge]
      merge
modified:
  mysql-test/r/status.result
  mysql-test/t/status.test

=== modified file 'mysql-test/r/status.result'
--- a/mysql-test/r/status.result	2008-08-08 11:39:35 +0000
+++ b/mysql-test/r/status.result	2008-08-09 08:20:06 +0000
@@ -163,13 +163,11 @@ Com_show_status	8
 rnd_diff	tmp_table_diff
 20	8
 flush status;
-show status like 'Com%function%';
+show status like 'Com%function';
 Variable_name	Value
 Com_alter_function	0
 Com_create_function	0
 Com_drop_function	0
-Com_show_function_code	0
-Com_show_function_status	0
 create function f1 (x INTEGER) returns integer
 begin
 declare ret integer;

=== modified file 'mysql-test/t/status.test'
--- a/mysql-test/t/status.test	2008-08-08 11:39:35 +0000
+++ b/mysql-test/t/status.test	2008-08-09 08:20:06 +0000
@@ -246,7 +246,7 @@ eval select substring_index('$rnd_next2'
 # Bug#30252 Com_create_function is not incremented.
 #
 flush status;
-show status like 'Com%function%';
+show status like 'Com%function';
 
 DELIMITER //;
 create function f1 (x INTEGER) returns integer