Skip to content

M
mariadb
Commit 88403016 authored by jonas@eel.(none)'s avatar jonas@eel.(none)
Browse files
Options

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 

into  eel.(none):/home/jonas/src/mysql-4.1-push
parents 38b77e39 eff11c53
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
sql/sql_parse.cc
View file @ 88403016
...@@ -3327,7 +3327,6 @@ purposes internal to the MySQL server", MYF(0)); ...@@ -3327,7 +3327,6 @@ purposes internal to the MySQL server", MYF(0));
!db_ok_with_wild_table(lex->name))) !db_ok_with_wild_table(lex->name)))
{ {
my_error(ER_SLAVE_IGNORED_TABLE, MYF(0)); my_error(ER_SLAVE_IGNORED_TABLE, MYF(0));
reset_one_shot_variables(thd);
break; break;
} }
#endif #endif
...@@ -3363,7 +3362,6 @@ purposes internal to the MySQL server", MYF(0)); ...@@ -3363,7 +3362,6 @@ purposes internal to the MySQL server", MYF(0));
!db_ok_with_wild_table(lex->name))) !db_ok_with_wild_table(lex->name)))
{ {
my_error(ER_SLAVE_IGNORED_TABLE, MYF(0)); my_error(ER_SLAVE_IGNORED_TABLE, MYF(0));
reset_one_shot_variables(thd);
break; break;
} }
#endif #endif
...@@ -3404,7 +3402,6 @@ purposes internal to the MySQL server", MYF(0)); ...@@ -3404,7 +3402,6 @@ purposes internal to the MySQL server", MYF(0));
!db_ok_with_wild_table(db))) !db_ok_with_wild_table(db)))
{ {
my_error(ER_SLAVE_IGNORED_TABLE, MYF(0)); my_error(ER_SLAVE_IGNORED_TABLE, MYF(0));
reset_one_shot_variables(thd);
break; break;
} }
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7