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

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:
unknown 2005-05-20 18:03:17 +02:00
commit b07d4dfcd7
3 changed files with 28 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -642,4 +642,8 @@ val x bug8408()
7 7 3
drop function bug8408|
delete from t1|
drop procedure if exists bug10537|
create procedure bug10537()
load data local infile '/tmp/somefile' into table t1|
ERROR 0A000: LOAD DATA is not allowed in stored procedures
drop table t1|

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

@ -893,6 +893,18 @@ drop function bug8408|
delete from t1|
#
# BUG#10537: Server crashes while loading data file into table through
# procedure.
# Disable load until it's PS and SP safe
--disable_warnings
drop procedure if exists bug10537|
--enable_warnings
--error ER_SP_BADSTATEMENT
create procedure bug10537()
load data local infile '/tmp/somefile' into table t1|
#
# BUG#NNNN: New bug synopsis
#

13
sql/sql_yacc.yy
View file

@ -6611,6 +6611,11 @@ use: USE_SYM ident
load: LOAD DATA_SYM
{
LEX *lex=Lex;
if (lex->sphead)
{
my_error(ER_SP_BADSTATEMENT, MYF(0), "LOAD DATA");
YYABORT;
}
lex->fname_start= lex->ptr;
}
load_data
@ -6618,7 +6623,13 @@ load: LOAD DATA_SYM
|
LOAD TABLE_SYM table_ident FROM MASTER_SYM
{
Lex->sql_command = SQLCOM_LOAD_MASTER_TABLE;
LEX *lex=Lex;
if (lex->sphead)
{
my_error(ER_SP_BADSTATEMENT, MYF(0), "LOAD TABLE");
YYABORT;
}
lex->sql_command = SQLCOM_LOAD_MASTER_TABLE;
if (!Select->add_table_to_list(YYTHD, $3, NULL, TL_OPTION_UPDATING))
YYABORT;
};