Commit e4317041 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0 

into  mysql.com:/users/lthalmann/bk/mysql-5.0-bug16487
parents d9a008d9 a334c723

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/t/rpl_ignore_table-slave.opt

0 → 100644
+1 −0
Original line number Diff line number Diff line 
--replicate-ignore-table=test.t1 --replicate-ignore-table=test.t2 --replicate-ignore-table=test.t3

mysql-test/t/rpl_ignore_table.test

0 → 100644
+28 −0
Original line number Diff line number Diff line 
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;