Skip to content

M
mariadb
Commit bef189cc authored by lars@mysql.com's avatar lars@mysql.com
Browse files
Options

Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-5.0 

into  mysql.com:/users/lthalmann/bkroot/mysql-5.0
parents 3d0082d3 5456afc6
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 0 deletions
sql/sql_parse.cc
View file @ bef189cc
...@@ -3208,6 +3208,7 @@ end_with_restore_list: ...@@ -3208,6 +3208,7 @@ end_with_restore_list:
if ((res= mysql_multi_update_prepare(thd))) if ((res= mysql_multi_update_prepare(thd)))
break; break;
#ifdef HAVE_REPLICATION
/* Check slave filtering rules */ /* Check slave filtering rules */
if (thd->slave_thread && all_tables_not_ok(thd, all_tables)) if (thd->slave_thread && all_tables_not_ok(thd, all_tables))
{ {
...@@ -3215,6 +3216,7 @@ end_with_restore_list: ...@@ -3215,6 +3216,7 @@ end_with_restore_list:
my_error(ER_SLAVE_IGNORED_TABLE, MYF(0)); my_error(ER_SLAVE_IGNORED_TABLE, MYF(0));
break; break;
} }
#endif /* HAVE_REPLICATION */
res= mysql_multi_update(thd, all_tables, res= mysql_multi_update(thd, all_tables,
&select_lex->item_list, &select_lex->item_list,
......
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