diff --git a/mysql-test/r/status.result b/mysql-test/r/status.result index c0eb48d906e..fd2a5b3d6bc 100644 --- a/mysql-test/r/status.result +++ b/mysql-test/r/status.result @@ -163,13 +163,11 @@ Com_show_status 8 rnd_diff tmp_table_diff 20 8 flush status; -show status like 'Com%function%'; +show global 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; @@ -177,10 +175,8 @@ set ret = x * 10; return ret; end // drop function f1; -show status like 'Com%function%'; +show global status like 'Com%function'; Variable_name Value Com_alter_function 0 Com_create_function 1 Com_drop_function 1 -Com_show_function_code 0 -Com_show_function_status 0 diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def index 85f9691e443..83742e54531 100644 --- a/mysql-test/t/disabled.def +++ b/mysql-test/t/disabled.def @@ -13,7 +13,6 @@ federated_transactions : Bug#29523 Transactions do not work 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 -status : Bug#32966 main.status fails thread_cache_size_func : Bug#36733 main.thread_cache_size_func fails randomly binlog_cache_size_basic_32 : Bug #36522: Some tests of system variables have diffs on 64bit platorms bulk_insert_buffer_size_basic_32 : Bug #36522: Some tests of system variables have diffs on 64bit platorms diff --git a/mysql-test/t/status.test b/mysql-test/t/status.test index ff033399434..3d200a9b4ea 100644 --- a/mysql-test/t/status.test +++ b/mysql-test/t/status.test @@ -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 status like 'Com%function%'; +show global status like 'Com%function'; DELIMITER //; create function f1 (x INTEGER) returns integer @@ -258,7 +258,7 @@ create function f1 (x INTEGER) returns integer DELIMITER ;// drop function f1; -show status like 'Com%function%'; +show global status like 'Com%function'; # End of 5.1 tests