bk commit into 5.0 tree (lars:1.2004) BUG#16487

[Lars Thalmann]

Below is the list of changes that have just been committed into a local
5.0 repository of lthalmann. When lthalmann does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2004 06/01/25 16:14:27 lars@stripped +3 -0
  BUG#16487: New test for ignored table and multi-update

  mysql-test/t/rpl_ignore_table.test
    1.1 06/01/25 16:14:20 lars@stripped +28 -0
    New test for ignored table and multi-update

  mysql-test/t/rpl_ignore_table-slave.opt
    1.1 06/01/25 16:14:20 lars@stripped +1 -0
    New option file

  mysql-test/t/rpl_ignore_table.test
    1.0 06/01/25 16:14:20 lars@stripped +0 -0
    BitKeeper file
/users/lthalmann/bk/mysql-5.0-bug16487/mysql-test/t/rpl_ignore_table.test

  mysql-test/t/rpl_ignore_table-slave.opt
    1.0 06/01/25 16:14:20 lars@stripped +0 -0
    BitKeeper file
/users/lthalmann/bk/mysql-5.0-bug16487/mysql-test/t/rpl_ignore_table-slave.opt

  mysql-test/r/rpl_ignore_table.result
    1.1 06/01/25 16:14:19 lars@stripped +16 -0
    New result file

  mysql-test/r/rpl_ignore_table.result
    1.0 06/01/25 16:14:19 lars@stripped +0 -0
    BitKeeper file
/users/lthalmann/bk/mysql-5.0-bug16487/mysql-test/r/rpl_ignore_table.result

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	lars
# Host:	dl145h.mysql.com
# Root:	/users/lthalmann/bk/mysql-5.0-bug16487
--- New file ---
+++ mysql-test/r/rpl_ignore_table.result	06/01/25 16:14:19
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;

--- New file ---
+++ mysql-test/t/rpl_ignore_table-slave.opt	06/01/25 16:14:20
--replicate-ignore-table=test.t1 --replicate-ignore-table=test.t2
--replicate-ignore-table=test.t3

--- New file ---
+++ mysql-test/t/rpl_ignore_table.test	06/01/25 16:14:20
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;