summaryrefslogtreecommitdiff
path: root/mysql-test/r/status.result
diff options
context:
space:
mode:
authorKristofer Pettersson <kpettersson@mysql.com>2008-05-21 17:34:14 +0200
committerKristofer Pettersson <kpettersson@mysql.com>2008-05-21 17:34:14 +0200
commitf6b7e7e411209163917d1e32d05be3a886d4e2ff (patch)
tree6af6bade728931483ebed909136e69885564ea8e /mysql-test/r/status.result
parent5b7566a1d311c0326d1e276680d03743011db549 (diff)
downloadmariadb-git-f6b7e7e411209163917d1e32d05be3a886d4e2ff.tar.gz
Reverted merging misstake.
mysql-test/r/status.result: reverted merging misstake mysql-test/t/status.test: reverted merging misstake
Diffstat (limited to 'mysql-test/r/status.result')
-rw-r--r--mysql-test/r/status.result4
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/status.result b/mysql-test/r/status.result
index fd2a5b3d6bc..b6f855d96cb 100644
--- a/mysql-test/r/status.result
+++ b/mysql-test/r/status.result
@@ -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