database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

BUG#15699 importing the fix from 5.0

Browse Source
This commit is contained in:
aelkin@mysql.com
2006-01-26 12:49:55 +02:00
parent 5c3027833b
commit 2fbdc5483a
5 changed files with 96 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
sql/sql_parse.cc
View File

@ -2840,21 +2840,26 @@ unsent_create_error:
if ((res= multi_update_precheck(thd, tables)))
break;
if ((res= mysql_multi_update_lock(thd, tables, &select_lex->item_list,
select_lex)))
break;
res= mysql_multi_update_lock(thd, tables, &select_lex->item_list,
select_lex);
#ifdef HAVE_REPLICATION
/* Check slave filtering rules */
if (thd->slave_thread)
if (all_tables_not_ok(thd,tables))
{
if (res!= 0)
{
res= 0; /* don't care of prev failure */
thd->clear_error(); /* filters are of highest prior */
}
/* we warn the slave SQL thread */
my_error(ER_SLAVE_IGNORED_TABLE, MYF(0));
break;
}
#endif /* HAVE_REPLICATION */
if (res)
break;
res= mysql_multi_update(thd,tables,
&select_lex->item_list,
&lex->value_list,