Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-4.1

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;

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;

--replicate-ignore-table=test.t1 --replicate-ignore-table=test.t2 --replicate-ignore-table=test.t3

source include/master-slave.inc;

#

# BUG#16487

#  

# Requirement:

# Multi-updates on ignored tables should not fail even if the slave does 

# not have the ignored tables.

#

# Note table t1, t2, and t3 are ignored in the option file to this test.

#

--echo **** Test case for BUG#16487 ****

--echo **** Master ****

connection master;

CREATE TABLE test.t4 (a int);

CREATE TABLE test.t1 (a int);

# Expect: The row must *not* by updated on slave, since t1 is ignored

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

--echo **** Slave ****

sync_slave_with_master;

SELECT * FROM t4;

connection master;

DROP TABLE t1;

DROP TABLE t4;

--replicate-wild-do-table=d1.%