mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 21:42:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge kpettersson@bk-internal.mysql.com:/home/bk/mysql-5.1-bugteam

Browse source 
into  adventure.(none):/home/thek/Development/cpp/mysql-5.1-bugteam
This commit is contained in:
thek@adventure.(none) 2008-05-14 11:14:04 +02:00
commit 57f94e48df
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
mysql-test/r/status.result
View file

@ -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

1
mysql-test/t/disabled.def
View file

@ -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

6
mysql-test/t/status.test
View file

@ -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