Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
be73c7ee
Commit
be73c7ee
authored
Mar 11, 2015
by
Oleksandr Byelkin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MDEV-6951: Erroneous SET STATEMENT produces two identical errors
Double error reporting removed.
parent
9f4ee16b
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
3 deletions
+17
-3
mysql-test/r/set_statement.result
mysql-test/r/set_statement.result
+8
-0
mysql-test/t/set_statement.test
mysql-test/t/set_statement.test
+8
-0
sql/sql_yacc.yy
sql/sql_yacc.yy
+1
-3
No files found.
mysql-test/r/set_statement.result
View file @
be73c7ee
...
@@ -1138,3 +1138,11 @@ password(a)
...
@@ -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'
mysql-test/t/set_statement.test
View file @
be73c7ee
...
@@ -1068,3 +1068,11 @@ execute stmt1;
...
@@ -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
;
sql/sql_yacc.yy
View file @
be73c7ee
...
@@ -367,9 +367,7 @@ find_sys_var_null_base(THD *thd, struct sys_var_with_base *tmp)
...
@@ -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();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment