Commit 956a5b6d authored by unknown's avatar unknown
Browse files

BUG#15699 importing the fix from 5.0 


sql/sql_parse.cc:
  BUG#15699,16487 merge of the fix made in 5.0
mysql-test/r/rpl_multi_update4.result:
  New BitKeeper file ``mysql-test/r/rpl_multi_update4.result''
mysql-test/t/rpl_multi_update4-slave.opt:
  New BitKeeper file ``mysql-test/t/rpl_multi_update4-slave.opt''
mysql-test/t/rpl_multi_update4.test:
  New BitKeeper file ``mysql-test/t/rpl_multi_update4.test''
mysql-test/r/rpl_ignore_table.result:
  New BitKeeper file ``mysql-test/r/rpl_ignore_table.result''
parent 7dd2ec0f

mysql-test/r/rpl_ignore_table.result

0 → 100644
+16 −0
Original line number Diff line number Diff line 
stop slave;

drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;

reset master;

reset slave;

drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;

start slave;

**** Test case for BUG#16487 ****

**** Master ****

CREATE TABLE test.t4 (a int);

CREATE TABLE test.t1 (a int);

UPDATE test.t4 NATURAL JOIN test.t1 SET t1.a=5;

**** Slave ****

SELECT * FROM t4;

a

DROP TABLE t1;

DROP TABLE t4;

mysql-test/r/rpl_multi_update4.result

0 → 100644
+25 −0
Original line number Diff line number Diff line 
stop slave;

drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;

reset master;

reset slave;

drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;

start slave;

drop database if exists d1;

drop database if exists d2;

drop database if exists d2;

create database d1;

create table d1.t0 (id int);

create database d2;

use d2;

create table t1 (id int);

create table t2 (id int);

insert into t1 values (1), (2), (3), (4), (5);

insert into t2 select id + 3 from t1;

update t1 join t2 using (id) set t1.id = 0;

insert into d1.t0 values (0);

use d1;

select * from t0 where id=0;

id

0

drop database d1;

drop database d2;

mysql-test/t/rpl_multi_update4-slave.opt

0 → 100644
+1 −0
Original line number Diff line number Diff line 
--replicate-wild-do-table=d1.%

mysql-test/t/rpl_multi_update4.test

0 → 100644
+44 −0
Original line number Diff line number Diff line 
# Let's verify that multi-update is not always skipped by slave if

# some replicate-* rules exist.

# (BUG#15699)



source include/master-slave.inc;



### Clean-up



connection master;

--disable_warnings

drop database if exists d1;

drop database if exists d2;



connection slave;

drop database if exists d2;

--enable_warnings



### Test



connection master;

create database d1;      # accepted by slave

create table d1.t0 (id int);

create database d2;      # ignored  by slave

use d2;

create table t1 (id int);

create table t2 (id int);

insert into t1 values (1), (2), (3), (4), (5);

insert into t2 select id + 3 from t1;

# a problematic query which must be filter out by slave

update t1 join t2 using (id) set t1.id = 0;

insert into d1.t0 values (0); # replication works



sync_slave_with_master;

use d1;

#connection slave;

select * from t0 where id=0;  # must find



### Clean-up

connection master;

drop database d1;

drop database d2;





# End of test

sql/sql_parse.cc

+10 −5
Original line number Diff line number Diff line
@@ -2840,20 +2840,25 @@ mysql_execute_command(THD *thd) 
    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,