1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge mysql.com:/usr/local/bk/mysql-5.0

Browse Source 
into mysql.com:/home/pem/work/mysql-5.0
This commit is contained in:
pem@mysql.com 2005-04-12 18:13:29 +02:00
commit 24d4264d02
4 changed files with 38 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mysql-test/r/sp.result
View File

@ -2844,4 +2844,10 @@ drop procedure bug6900|
drop procedure bug9074| drop procedure bug9074|
drop procedure bug6900_9074| drop procedure bug6900_9074|
drop table t3| drop table t3|
drop procedure if exists avg|
create procedure avg ()
begin
end|
call avg ()|
drop procedure avg|
drop table t1,t2; drop table t1,t2;

14
mysql-test/t/sp.test
View File

@ -3481,6 +3481,20 @@ drop procedure bug6900_9074|
drop table t3| drop table t3|
#
# BUG#7185: Stored procedure crash if identifier is AVG
#
--disable_warnings
drop procedure if exists avg|
--enable_warnings
create procedure avg ()
begin
end|
call avg ()|
drop procedure avg|
# #
# BUG#NNNN: New bug synopsis # BUG#NNNN: New bug synopsis
# #

14
sql/sql_parse.cc
View File

@ -4128,8 +4128,16 @@ unsent_create_error:
sp= sp_find_function(thd, lex->spname); sp= sp_find_function(thd, lex->spname);
mysql_reset_errors(thd, 0); mysql_reset_errors(thd, 0);
if (! sp) if (! sp)
{
if (lex->spname->m_db.str)
result= SP_KEY_NOT_FOUND; result= SP_KEY_NOT_FOUND;
else else
{
my_message(ER_NO_DB_ERROR, ER(ER_NO_DB_ERROR), MYF(0));
goto error;
}
}
else
{ {
if (check_procedure_access(thd, ALTER_PROC_ACL, sp->m_db.str, if (check_procedure_access(thd, ALTER_PROC_ACL, sp->m_db.str,
sp->m_name.str, 0)) sp->m_name.str, 0))
@ -4207,7 +4215,13 @@ unsent_create_error:
} }
} }
#endif #endif
if (lex->spname->m_db.str)
result= SP_KEY_NOT_FOUND; result= SP_KEY_NOT_FOUND;
else
{
my_message(ER_NO_DB_ERROR, ER(ER_NO_DB_ERROR), MYF(0));
goto error;
}
} }
res= result; res= result;
switch (result) switch (result)

4
sql/sql_yacc.yy
View File

@ -1328,12 +1328,12 @@ clear_privileges:
; ;
sp_name: sp_name:
IDENT_sys '.' IDENT_sys ident '.' ident
{ {
$$= new sp_name($1, $3); $$= new sp_name($1, $3);
$$->init_qname(YYTHD); $$->init_qname(YYTHD);
} }
| IDENT_sys | ident
{ {
$$= sp_name_current_db_new(YYTHD, $1); $$= sp_name_current_db_new(YYTHD, $1);
} }