1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bug#36099 replicate-do-db affects replaying RBR events with mysqlbinlog

Browse Source 
The replication filtering rules were inappropiately applied when
executing BINLOG pseudo-query.  The rules are supposed to be active
only at times when the slave's sql thread executes an event.
            
Fixed with correcting a condition to call replication rules only if
the slave sql thread executes the event.
This commit is contained in:
Andrei Elkin 2008-09-03 13:01:18 +03:00
parent 4c318bf6e8
commit 21a08eabad
4 changed files with 46 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mysql-test/suite/rpl/r/rpl_binlog_query_filter_rules.result Normal file
View File

@ -0,0 +1,11 @@
drop table if exists t1;
reset master;
create table t1 (a int);
insert into t1 values (1);
flush logs;
drop table t1;
*** must be 1 ***
select * from t1;
a
1
drop table t1;

1
mysql-test/suite/rpl/t/rpl_binlog_query_filter_rules-master.opt Normal file
View File

@ -0,0 +1 @@
--replicate-do-db='impossible_database'

31
mysql-test/suite/rpl/t/rpl_binlog_query_filter_rules.test Normal file
View File

@ -0,0 +1,31 @@
# regression test for
# Bug#36099 replicate-do-db affects replaying RBR events with mysqlbinlog
# The test verifies that the slave side filtering rule does not affect
# applying of row-events on master via mysqlbinlog
-- source include/have_log_bin.inc
-- source include/not_embedded.inc
-- source include/have_binlog_format_row.inc
--disable_warnings
drop table if exists t1;
--enable_warnings
reset master;
create table t1 (a int);
insert into t1 values (1);
flush logs;
--exec $MYSQL_BINLOG $MYSQLTEST_VARDIR/log/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/bug36099.sql
drop table t1;
--exec $MYSQL -e "source $MYSQLTEST_VARDIR/tmp/bug36099.sql"
--echo *** must be 1 ***
select * from t1;
# cleanup
drop table t1;
remove_file $MYSQLTEST_VARDIR/tmp/bug36099.sql;

5
sql/log_event.cc
View File

@ -7843,8 +7843,9 @@ int Table_map_log_event::do_apply_event(Relay_log_info const *rli)
int error= 0;
if (!rpl_filter->db_ok(table_list->db) ||
(rpl_filter->is_on() && !rpl_filter->tables_ok("", table_list)))
if (rli->sql_thd->slave_thread /* filtering is for slave only */ &&
(!rpl_filter->db_ok(table_list->db) ||
(rpl_filter->is_on() && !rpl_filter->tables_ok("", table_list))))
{
my_free(memory, MYF(MY_WME));
}