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

Merge jwinstead@bk-internal.mysql.com:/home/bk/mysql-5.0

Browse source 
into mysql.com:/home/jwinstead2/mysql-5.0
This commit is contained in:
jimw@mysql.com 2005-01-04 02:47:48 +01:00
commit 050e229162
3 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mysql-test/r/sp-error.result
View file

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

2
mysql-test/t/sp-error.test
View file

@ -81,6 +81,8 @@ call foo()|
drop procedure if exists foo|
--error 1305
show create procedure foo|
--error 1305
show create function foo|
# LEAVE/ITERATE/GOTO with no match
--error 1308

1
sql/sql_parse.cc
View file

@ -52,6 +52,7 @@
#define SP_COM_STRING(LP) \
((LP)->sql_command == SQLCOM_CREATE_SPFUNCTION || \
(LP)->sql_command == SQLCOM_ALTER_FUNCTION || \
(LP)->sql_command == SQLCOM_SHOW_CREATE_FUNC || \
(LP)->sql_command == SQLCOM_DROP_FUNCTION ? \
"FUNCTION" : "PROCEDURE")