summaryrefslogtreecommitdiff
path: root/mysql-test/r
diff options
context:
space:
mode:
authorunknown <jimw@mysql.com>2005-01-04 19:00:22 +0100
committerunknown <jimw@mysql.com>2005-01-04 19:00:22 +0100
commitb064b1476163dc813dbfad8b1d75a38d40873108 (patch)
tree05c5f84ce112afb682023a8904c7aaa2c166be51 /mysql-test/r
parent7379ce22c0136c5bec74fe9acee0e8dc0fd84057 (diff)
parentd6e81bfa077c49410e78663b91b2cb4973215fd4 (diff)
downloadmariadb-git-b064b1476163dc813dbfad8b1d75a38d40873108.tar.gz
Merge jwinstead@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jwinstead2/mysql-5.0 sql/sql_parse.cc: Auto merged
Diffstat (limited to 'mysql-test/r')
-rw-r--r--mysql-test/r/sp-error.result2
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/r/sp-error.result b/mysql-test/r/sp-error.result
index 642f1aedd78..57126162e3f 100644
--- a/mysql-test/r/sp-error.result
+++ b/mysql-test/r/sp-error.result
@@ -47,6 +47,8 @@ Warnings:
Note 1305 PROCEDURE foo does not exist
show create procedure foo|
ERROR 42000: PROCEDURE foo does not exist
+show create function foo|
+ERROR 42000: FUNCTION foo does not exist
create procedure foo()
foo: loop
leave bar;