summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <thek@adventure.(none)>2008-05-13 16:10:08 +0200
committerunknown <thek@adventure.(none)>2008-05-13 16:10:08 +0200
commite17706eee283d642ee19dd92095ca0da5efa43f0 (patch)
treeed227ef1e5fcc48bc871d6e3dedb2e6143e9238a
parentd27005e708851ad5f5745e47298afad576f53a74 (diff)
downloadmariadb-git-e17706eee283d642ee19dd92095ca0da5efa43f0.tar.gz
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: Reduce test to testing session status until 'FLUSH GLOBAL STATUS' is implemented. mysql-test/t/disabled.def: Enable main.status.test. mysql-test/t/status.test: Reduce test to testing session status until 'FLUSH GLOBAL STATUS' is implemented.
-rw-r--r--mysql-test/r/status.result5
-rw-r--r--mysql-test/t/disabled.def1
-rw-r--r--mysql-test/t/status.test6
3 files changed, 6 insertions, 6 deletions
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 2fd6adaba78..e6f35bf776d 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