diff options
author | unknown <lars@mysql.com> | 2005-03-21 23:05:55 +0100 |
---|---|---|
committer | unknown <lars@mysql.com> | 2005-03-21 23:05:55 +0100 |
commit | 69ca9a9416df9084c2a75aeb62a6979cecf4e5c6 (patch) | |
tree | 8b6efeea8d68c7888aaf78f4150376d941b923e5 /sql/sql_repl.h | |
parent | 796b352862a5c94ea2de1c5910ab45d2ca5eb8ae (diff) | |
parent | 03c42246a5a50ce62b49e8fce4b263b0468d5f46 (diff) | |
download | mariadb-git-69ca9a9416df9084c2a75aeb62a6979cecf4e5c6.tar.gz |
Merge
sql/log_event.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/slave.h:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_acl.h:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
sql/sql_repl.h:
Auto merged
sql/Makefile.am:
Manual merge
sql/log.cc:
Manual merge
Diffstat (limited to 'sql/sql_repl.h')
-rw-r--r-- | sql/sql_repl.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/sql_repl.h b/sql/sql_repl.h index 9eb6456ee20..eec85826da4 100644 --- a/sql/sql_repl.h +++ b/sql/sql_repl.h @@ -17,6 +17,9 @@ #ifdef HAVE_REPLICATION #include "slave.h" +extern Rpl_filter *binlog_filter; +extern Rpl_filter *rpl_filter; + typedef struct st_slave_info { uint32 server_id; @@ -31,7 +34,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<i_string> binlog_do_db, binlog_ignore_db; extern int max_binlog_dump_events; extern my_bool opt_sporadic_binlog_dump_fail; |