diff --git a/mysql-test/r/status.result b/mysql-test/r/status.result index fc78f4ad40f..c0eb48d906e 100644 --- a/mysql-test/r/status.result +++ b/mysql-test/r/status.result @@ -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 --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def index deeafa555f0..4df205465b4 100644 --- a/mysql-test/t/disabled.def +++ b/mysql-test/t/disabled.def @@ -10,7 +10,6 @@ # ############################################################################## federated_transactions : Bug#29523 Transactions do not work -status : Bug#32966 main.status fails ps_ddl : Bug#12093 2007-12-14 pending WL#4165 / WL#4166 csv_alter_table : Bug#33696 2008-01-21 pcrews no .result file - bug allows NULL columns in CSV tables user_limits : Bug#23921 random failure of user_limits.test diff --git a/mysql-test/t/status.test b/mysql-test/t/status.test index 25bf2a6ee61..ff033399434 100644 --- a/mysql-test/t/status.test +++ b/mysql-test/t/status.test @@ -245,7 +245,8 @@ eval select substring_index('$rnd_next2',0x9,-1)-substring_index('$rnd_next',0x9 # # 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 integer DELIMITER ;// drop function f1; - -show global status like 'Com%function%'; +show status like 'Com%function%'; # End of 5.1 tests