bk commit into 5.0 tree (aelkin:1.2113) BUG#18715

[Andrei Elkin]

Below is the list of changes that have just been committed into a local
5.0 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.2113 06/05/12 20:10:09 aelkin@stripped +3 -0
  Bug#18715: replicate-wild-ignore-table prevents CREATE VIEW from replicating
  
  extra changeset to check that do/ignore rules apply to views same way as to tables.

  mysql-test/t/rpl_view.test
    1.4 06/05/12 20:10:04 aelkin@stripped +5 -2
    a view to not replicate is added

  mysql-test/t/rpl_view-slave.opt
    1.3 06/05/12 20:10:04 aelkin@stripped +1 -1
    options fixed to reject a view basing on tables rejection rules

  mysql-test/r/rpl_view.result
    1.4 06/05/12 20:10:04 aelkin@stripped +8 -2
    results changed

# 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/5.0-rpl_bug18715_extra

--- 1.2/mysql-test/t/rpl_view-slave.opt	2006-04-14 12:13:21 +03:00
+++ 1.3/mysql-test/t/rpl_view-slave.opt	2006-05-12 20:10:04 +03:00
@@ -1 +1 @@
---replicate-ignore-table=test.foo
+--replicate-ignore-table=test.v_ignore

--- 1.3/mysql-test/r/rpl_view.result	2005-09-14 23:11:56 +03:00
+++ 1.4/mysql-test/r/rpl_view.result	2006-05-12 20:10:04 +03:00
@@ -5,25 +5,30 @@
 drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
 start slave;
 drop table if exists t1,v1;
-drop view if exists t1,v1;
+drop view if exists t1,v1,v_ignore;
 reset master;
 create table t1 (a int);
 insert into t1 values (1);
 create view v1 as select a from t1;
+create view v_ignore as select a from v1;
 insert into v1 values (2);
+insert into v_ignore values (3);
 select * from v1 order by a;
 a
 1
 2
-select * from v1 order by a;
+3
+select * from v1 order by a /* no value 3 */;
 a
 1
 2
+drop view v_ignore;
 update v1 set a=3 where a=1;
 select * from v1 order by a;
 a
 2
 3
+3
 select * from v1 order by a;
 a
 2
@@ -31,6 +36,7 @@
 delete from v1 where a=2;
 select * from v1 order by a;
 a
+3
 3
 select * from v1 order by a;
 a

--- 1.3/mysql-test/t/rpl_view.test	2005-09-14 23:11:56 +03:00
+++ 1.4/mysql-test/t/rpl_view.test	2006-05-12 20:10:04 +03:00
@@ -1,7 +1,7 @@
 source include/master-slave.inc;
 --disable_warnings
 drop table if exists t1,v1;
-drop view if exists t1,v1;
+drop view if exists t1,v1,v_ignore;
 sync_slave_with_master;
 reset master;
 --enable_warnings
@@ -14,12 +14,15 @@
 create table t1 (a int);
 insert into t1 values (1);
 create view v1 as select a from t1;
+create view v_ignore as select a from v1;
 insert into v1 values (2);
+insert into v_ignore values (3);
 select * from v1 order by a;
 sync_slave_with_master;
 # view already have to be on slave
-select * from v1 order by a;
+select * from v1 order by a /* no value 3 */;
 connection master;
+drop view v_ignore;
 update v1 set a=3 where a=1;
 select * from v1 order by a;
 sync_slave_with_master;