From 1dcfe028a7e5509489cf2db5db37c3e2c6705d76 Mon Sep 17 00:00:00 2001
From: unknown <aelkin@mysql.com>
Date: Mon, 23 Jan 2006 18:03:09 +0200
Subject: BUG#15699, failure to apply ignore rule for unexisting table.

Since replication rules execute after `mysql_multi_update_prepare' returns we
delay to `break' in case this functions returns non-zero (some tables are not found)
for to examine if there is an ignore rule for a not-found table. By doing that
it is guaranteed do/ignore replication rules logically preceed opening table routine.


sql/sql_parse.cc:
  BUG#15699. We delay to `break' in case of unexisted tables for multi-update.
  First it is checked whether an ignore rule for such a table exists.

  More to the fix:
  if (opt_readonly && ...' in two places got be idented because it were
  enclosed explicitly into corresponding `else' groups. For that
  the preceding lines with `else' were changed in to be
  `else
   {'.
  This grouping is necessary to avoid any inattentive
  insertion in between of `else' and belonging to the else
  `if (opt_readonly && ...' statement.
mysql-test/r/rpl_multi_update4.result:
  New BitKeeper file ``mysql-test/r/rpl_multi_update4.result''
mysql-test/t/rpl_multi_update4-slave.opt:
  New BitKeeper file ``mysql-test/t/rpl_multi_update4-slave.opt''
mysql-test/t/rpl_multi_update4.test:
  New BitKeeper file ``mysql-test/t/rpl_multi_update4.test''
---
 mysql-test/r/rpl_multi_update4.result    | 25 ++++++++++++++++++
 mysql-test/t/rpl_multi_update4-slave.opt |  1 +
 mysql-test/t/rpl_multi_update4.test      | 44 ++++++++++++++++++++++++++++++++
 3 files changed, 70 insertions(+)
 create mode 100644 mysql-test/r/rpl_multi_update4.result
 create mode 100644 mysql-test/t/rpl_multi_update4-slave.opt
 create mode 100644 mysql-test/t/rpl_multi_update4.test

(limited to 'mysql-test')

diff --git a/mysql-test/r/rpl_multi_update4.result b/mysql-test/r/rpl_multi_update4.result
new file mode 100644
index 00000000000..f6dde65a35d
--- /dev/null
+++ b/mysql-test/r/rpl_multi_update4.result
@@ -0,0 +1,25 @@
+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;
diff --git a/mysql-test/t/rpl_multi_update4-slave.opt b/mysql-test/t/rpl_multi_update4-slave.opt
new file mode 100644
index 00000000000..fea27db43ee
--- /dev/null
+++ b/mysql-test/t/rpl_multi_update4-slave.opt
@@ -0,0 +1 @@
+--replicate-wild-do-table=d1.%
diff --git a/mysql-test/t/rpl_multi_update4.test b/mysql-test/t/rpl_multi_update4.test
new file mode 100644
index 00000000000..3d909b8e5cd
--- /dev/null
+++ b/mysql-test/t/rpl_multi_update4.test
@@ -0,0 +1,44 @@
+# Let's verify that multi-update is not always skipped by slave if
+# some replicate-* rules exist.
+# (BUG#15699)
+
+source include/master-slave.inc;
+
+### Clean-up
+
+connection master;
+--disable_warnings
+drop database if exists d1;
+drop database if exists d2;
+
+connection slave;
+drop database if exists d2;
+--enable_warnings
+
+### Test
+
+connection master;
+create database d1;      # accepted by slave
+create table d1.t0 (id int);
+create database d2;      # ignored  by slave
+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;
+# a problematic query which must be filter out by slave
+update t1 join t2 using (id) set t1.id = 0;
+insert into d1.t0 values (0); # replication works
+
+sync_slave_with_master;
+use d1;
+#connection slave;
+select * from t0 where id=0;  # must find
+
+### Clean-up
+connection master;
+drop database d1;
+drop database d2;
+
+
+# End of test
-- 
cgit v1.2.1