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

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

Browse Source 
into  mysql.com:/users/lthalmann/bkroot/mysql-5.0
This commit is contained in:
lars@mysql.com 2005-10-10 21:52:50 +02:00
commit bef189cc4e
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_parse.cc
View File

@ -3208,6 +3208,7 @@ end_with_restore_list:
if ((res= mysql_multi_update_prepare(thd)))
break;
#ifdef HAVE_REPLICATION
/* Check slave filtering rules */
if (thd->slave_thread && all_tables_not_ok(thd, all_tables))
{
@ -3215,6 +3216,7 @@ end_with_restore_list:
my_error(ER_SLAVE_IGNORED_TABLE, MYF(0));
break;
}
#endif /* HAVE_REPLICATION */
res= mysql_multi_update(thd, all_tables,
&select_lex->item_list,