database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-09 22:24:09 +03:00
Code Activity

MDEV-6951: Erroneous SET STATEMENT produces two identical errors

Browse Source 
Double error reporting removed.
This commit is contained in:
Oleksandr Byelkin
2015-03-11 14:57:30 +01:00
parent 9f4ee16bf3
commit be73c7ee44
3 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mysql-test/r/set_statement.result
View File

@@ -1138,3 +1138,11 @@ password(a)
deallocate prepare stmt1; deallocate prepare stmt1;
drop table t1; drop table t1;
set @@old_passwords=@save_old_passwords; set @@old_passwords=@save_old_passwords;
#
#MDEV-6951:Erroneous SET STATEMENT produces two identical errors
#
set statement non_existing=1 for select 1;
ERROR HY000: Unknown system variable 'non_existing'
show errors;
Level Code Message
Error 1193 Unknown system variable 'non_existing'

8
mysql-test/t/set_statement.test
View File

@@ -1068,3 +1068,11 @@ execute stmt1;
deallocate prepare stmt1; deallocate prepare stmt1;
drop table t1; drop table t1;
set @@old_passwords=@save_old_passwords; set @@old_passwords=@save_old_passwords;
--echo #
--echo #MDEV-6951:Erroneous SET STATEMENT produces two identical errors
--echo #
--error ER_UNKNOWN_SYSTEM_VARIABLE
set statement non_existing=1 for select 1;
show errors;

4
sql/sql_yacc.yy
View File

@@ -367,9 +367,7 @@ find_sys_var_null_base(THD *thd, struct sys_var_with_base *tmp)
{ {
tmp->var= find_sys_var(thd, tmp->base_name.str, tmp->base_name.length); tmp->var= find_sys_var(thd, tmp->base_name.str, tmp->base_name.length);
if (tmp->var == NULL) if (tmp->var != NULL)
my_error(ER_UNKNOWN_SYSTEM_VARIABLE, MYF(0), tmp->base_name.str);
else
tmp->base_name= null_lex_str; tmp->base_name= null_lex_str;
return thd->is_error(); return thd->is_error();