From 4b3caa85c426291bec6c51f3cc3c6b500ca0e6f2 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 8 Mar 2005 21:12:35 +0100 Subject: WL#2472: Refactoring of replication and binlog filtering. Needed to be able to have multiple masters connected to same slave server with different filters. sql/Makefile.am: Add table_filter.cc sql/log.cc: Use Table_filter sql/log_event.cc: Use Table_filter sql/mysql_priv.h: Use Table_filter sql/mysqld.cc: Use Table_filter sql/repl_failsafe.cc: Use Table_filter sql/slave.cc: Use Table_filter sql/slave.h: Use Table_filter sql/sql_acl.cc: Use Table_filter sql/sql_class.h: Use const since they should not be changed sql/sql_parse.cc: Use Table_filter sql/sql_repl.cc: Use Table_filter sql/sql_repl.h: Use Table_filter --- sql/sql_repl.h | 1 - 1 file changed, 1 deletion(-) (limited to 'sql/sql_repl.h') diff --git a/sql/sql_repl.h b/sql/sql_repl.h index e8497fee343..a13c1076b2c 100644 --- a/sql/sql_repl.h +++ b/sql/sql_repl.h @@ -31,7 +31,6 @@ typedef struct st_slave_info extern my_bool opt_show_slave_auth_info; extern char *master_host, *master_info_file; extern bool server_id_supplied; -extern I_List binlog_do_db, binlog_ignore_db; extern int max_binlog_dump_events; extern my_bool opt_sporadic_binlog_dump_fail; -- cgit v1.2.1 From f532a8f0ce2c7f9ef829165cadba24cec38a58b8 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 10 Mar 2005 14:36:48 +0100 Subject: WL#2472: Addendum: Fixes after Mats review --- sql/sql_repl.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'sql/sql_repl.h') diff --git a/sql/sql_repl.h b/sql/sql_repl.h index a13c1076b2c..363e36c55a4 100644 --- a/sql/sql_repl.h +++ b/sql/sql_repl.h @@ -17,6 +17,9 @@ #ifdef HAVE_REPLICATION #include "slave.h" +extern Table_filter *binlog_filter; +extern Table_filter *rpl_filter; + typedef struct st_slave_info { uint32 server_id; -- cgit v1.2.1 From 03c42246a5a50ce62b49e8fce4b263b0468d5f46 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 21 Mar 2005 22:09:42 +0100 Subject: WL#2472: Renamed Table_filter to Rpl_filter Eliminated very annoying memory leak sql/Makefile.am: Renamed Table_filter to Rpl_filter sql/log.cc: Renamed Table_filter to Rpl_filter sql/log_event.cc: Renamed Table_filter to Rpl_filter sql/mysqld.cc: Renamed Table_filter to Rpl_filter Eliminated very annoying memory leak sql/repl_failsafe.cc: Renamed Table_filter to Rpl_filter sql/slave.cc: Renamed Table_filter to Rpl_filter sql/slave.h: Renamed Table_filter to Rpl_filter sql/sql_acl.h: Renamed Table_filter to Rpl_filter sql/sql_parse.cc: Renamed Table_filter to Rpl_filter sql/sql_repl.cc: Renamed Table_filter to Rpl_filter sql/rpl_filter.cc: Renamed Table_filter to Rpl_filter sql/rpl_filter.h: Renamed Table_filter to Rpl_filter sql/sql_repl.h: Renamed Table_filter to Rpl_filter --- sql/sql_repl.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sql/sql_repl.h') diff --git a/sql/sql_repl.h b/sql/sql_repl.h index 363e36c55a4..447e470ff1c 100644 --- a/sql/sql_repl.h +++ b/sql/sql_repl.h @@ -17,8 +17,8 @@ #ifdef HAVE_REPLICATION #include "slave.h" -extern Table_filter *binlog_filter; -extern Table_filter *rpl_filter; +extern Rpl_filter *binlog_filter; +extern Rpl_filter *rpl_filter; typedef struct st_slave_info { -- cgit v1.2.1