Commit 62d62278 authored by unknown's avatar unknown
Browse files

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

into  mysql.com:/users/lthalmann/bkroot/mysql-5.0
parents 55ca2515 56af2fc1

sql/sql_parse.cc

+2 −0
Original line number Diff line number Diff line
@@ -3208,6 +3208,7 @@ mysql_execute_command(THD *thd) 
      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 @@ mysql_execute_command(THD *thd) 
	my_error(ER_SLAVE_IGNORED_TABLE, MYF(0));

	break;

      }

#endif /* HAVE_REPLICATION */



      res= mysql_multi_update(thd, all_tables,

                              &select_lex->item_list,