bk commit into 4.1 tree (aelkin:1.2460) BUG#15699

[Andrei Elkin]

Below is the list of changes that have just been committed into a local
4.1 repository of elkin. When elkin 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.2460 06/01/26 12:51:34 aelkin@stripped +2 -0
  BUG#16487 importing the test case from 5.0 (the fix is done in BUG#15699)

  mysql-test/t/rpl_ignore_table.test
    1.1 06/01/26 12:51:31 aelkin@stripped +28 -0
    New BitKeeper file ``mysql-test/t/rpl_ignore_table.test''

  mysql-test/t/rpl_ignore_table-slave.opt
    1.1 06/01/26 12:51:31 aelkin@stripped +1 -0
    New BitKeeper file ``mysql-test/t/rpl_ignore_table-slave.opt''

  mysql-test/t/rpl_ignore_table.test
    1.0 06/01/26 12:51:31 aelkin@stripped +0 -0
    BitKeeper file /usr_rh9/home/elkin.rh9/MySQL/FIXES/mysql-4.1-bug16487/mysql-test/t/rpl_ignore_table.test

  mysql-test/t/rpl_ignore_table-slave.opt
    1.0 06/01/26 12:51:31 aelkin@stripped +0 -0
    BitKeeper file /usr_rh9/home/elkin.rh9/MySQL/FIXES/mysql-4.1-bug16487/mysql-test/t/rpl_ignore_table-slave.opt

# 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:	aelkin
# Host:	dsl-hkigw8-feb0de00-199.dhcp.inet.fi
# Root:	/usr_rh9/home/elkin.rh9/MySQL/FIXES/mysql-4.1-bug16487
--- New file ---
+++ mysql-test/t/rpl_ignore_table-slave.opt	06/01/26 12:51:31
--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/26 12:51:31
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;