summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorunknown <gluh@mysql.com>2005-07-19 13:50:55 +0500
committerunknown <gluh@mysql.com>2005-07-19 13:50:55 +0500
commit98f08e583fadebf7ad2bdff706c58bd323ac6a89 (patch)
tree1cfbe36e4fd5ea7b0ff651e3b461355368645aab /mysql-test
parentba9deb820775493addd24189aa9b66cded652561 (diff)
parent855aafe0a7f5421c494603ab9e740229a8a2585e (diff)
downloadmariadb-git-98f08e583fadebf7ad2bdff706c58bd323ac6a89.tar.gz
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/gluh/MySQL/Merge/5.0
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/information_schema.result3
-rw-r--r--mysql-test/t/information_schema.test2
2 files changed, 5 insertions, 0 deletions
diff --git a/mysql-test/r/information_schema.result b/mysql-test/r/information_schema.result
index 98f3d59485f..a0ad743ac2a 100644
--- a/mysql-test/r/information_schema.result
+++ b/mysql-test/r/information_schema.result
@@ -298,6 +298,9 @@ show create function sub2;
Function sql_mode Create Function
sub2 CREATE FUNCTION `test`.`sub2`(i int) RETURNS int(11)
return i+1
+show function status like "sub2";
+Db Name Type Definer Modified Created Security_type Comment
+test sub2 FUNCTION mysqltest_1@localhost # # DEFINER
drop function sub2;
show create procedure sel2;
Procedure sql_mode Create Procedure
diff --git a/mysql-test/t/information_schema.test b/mysql-test/t/information_schema.test
index 7c0624b67fd..0ac68c37d15 100644
--- a/mysql-test/t/information_schema.test
+++ b/mysql-test/t/information_schema.test
@@ -157,6 +157,8 @@ select ROUTINE_NAME, ROUTINE_DEFINITION from information_schema.ROUTINES;
show create procedure sel2;
show create function sub1;
show create function sub2;
+--replace_column 5 # 6 #
+show function status like "sub2";
connection default;
disconnect user1;
drop function sub2;