Commit e2ff8580 authored by Kristofer Pettersson's avatar Kristofer Pettersson

Reverted merging misstake.

mysql-test/r/status.result:
  reverted merging misstake
mysql-test/t/status.test:
  reverted merging misstake
parent 7ebf3c80
......@@ -163,7 +163,7 @@ Com_show_status 8
rnd_diff tmp_table_diff
20 8
flush status;
show global status like 'Com%function';
show status like 'Com%function';
Variable_name Value
Com_alter_function 0
Com_create_function 0
......@@ -175,7 +175,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
......
......@@ -246,7 +246,7 @@ eval select substring_index('$rnd_next2',0x9,-1)-substring_index('$rnd_next',0x9
# Bug#30252 Com_create_function is not incremented.
#
flush status;
show global status like 'Com%function';
show status like 'Com%function';
DELIMITER //;
create function f1 (x INTEGER) returns integer
......@@ -259,6 +259,6 @@ DELIMITER ;//
drop function f1;
show global status like 'Com%function';
show status like 'Com%function';
# End of 5.1 tests
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment