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

Bug#13510 "Setting password local variable changes current

Browse Source 
password": additional fix, also make sure that a syntax error is 
returned for set names="foo" when there is no such variable or no
stored procedure.


mysql-test/r/sp-error.result:
  Test results fixed: a new test for Bug#13510
mysql-test/t/sp-error.test:
  A new test for Bug#13510 (set names out of an SP)
sql/sql_yacc.yy:
  Bug#13510: fix the case when there is no stored procedure or
  no 'names' variable declared. Return a syntax error in this case.
This commit is contained in:
unknown 2005-11-19 01:22:12 +03:00
parent a11caf1e01
commit 6ba79a2516
3 changed files with 9 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

@ -845,6 +845,8 @@ set password = 'foo1';
select password; select password;
end| end|
ERROR 42000: Variable 'password' must be quoted with `...`, or renamed ERROR 42000: Variable 'password' must be quoted with `...`, or renamed
set names='foo2'|
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1
create procedure bug13510_2() create procedure bug13510_2()
begin begin
declare names varchar(10); declare names varchar(10);

4
mysql-test/t/sp-error.test
View File

@ -1233,6 +1233,10 @@ begin
select password; select password;
end| end|
# Check that an error message is sent
--error ER_PARSE_ERROR
set names='foo2'|
--error ER_SP_BAD_VAR_SHADOW --error ER_SP_BAD_VAR_SHADOW
create procedure bug13510_2() create procedure bug13510_2()
begin begin

3
sql/sql_yacc.yy
View File

@ -7925,6 +7925,9 @@ option_value:
names.length= 5; names.length= 5;
if (spc && spc->find_pvar(&names)) if (spc && spc->find_pvar(&names))
my_error(ER_SP_BAD_VAR_SHADOW, MYF(0), names.str); my_error(ER_SP_BAD_VAR_SHADOW, MYF(0), names.str);
else
yyerror(ER(ER_SYNTAX_ERROR));
YYABORT; YYABORT;
} }
| NAMES_SYM charset_name_or_default opt_collate | NAMES_SYM charset_name_or_default opt_collate