diff options
| author | unknown <lars@mysql.com> | 2005-03-22 10:19:24 +0100 |
|---|---|---|
| committer | unknown <lars@mysql.com> | 2005-03-22 10:19:24 +0100 |
| commit | 73f6834e3dfd73f23bc2a711ccdb92788d33be0c (patch) | |
| tree | b19174ede8963f86f8cacd14c1ac87b1ba5df7c2 /sql | |
| parent | 69ca9a9416df9084c2a75aeb62a6979cecf4e5c6 (diff) | |
| download | mariadb-git-73f6834e3dfd73f23bc2a711ccdb92788d33be0c.tar.gz | |
WL#2472: Fixes according to review
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/rpl_filter.h | 9 | ||||
| -rw-r--r-- | sql/slave.h | 2 | ||||
| -rw-r--r-- | sql/sql_acl.h | 1 | ||||
| -rw-r--r-- | sql/sql_repl.h | 3 |
4 files changed, 6 insertions, 9 deletions
diff --git a/sql/rpl_filter.h b/sql/rpl_filter.h index 70bb137790e..cfcb3b43607 100644 --- a/sql/rpl_filter.h +++ b/sql/rpl_filter.h @@ -14,8 +14,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef __RPL_FILTER_H__ -#define __RPL_FILTER_H__ +#ifndef RPL_FILTER_H +#define RPL_FILTER_H #include "mysql.h" #include "my_list.h" @@ -107,4 +107,7 @@ private: I_List<i_string_pair> rewrite_db; }; -#endif // __TABLE_FILTER_H__ +extern Rpl_filter *rpl_filter; +extern Rpl_filter *binlog_filter; + +#endif // RPL_FILTER_H diff --git a/sql/slave.h b/sql/slave.h index a29315f7ae4..61cd5490b90 100644 --- a/sql/slave.h +++ b/sql/slave.h @@ -27,8 +27,6 @@ #define MAX_SLAVE_ERRMSG 1024 #define MAX_SLAVE_ERROR 2000 -extern Rpl_filter *rpl_filter; - /***************************************************************************** MySQL Replication diff --git a/sql/sql_acl.h b/sql/sql_acl.h index 21f14fc3045..7833e9ea9bb 100644 --- a/sql/sql_acl.h +++ b/sql/sql_acl.h @@ -15,7 +15,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "slave.h" // for tables_ok(), rpl_filter -extern Rpl_filter *rpl_filter; #define SELECT_ACL (1L << 0) #define INSERT_ACL (1L << 1) diff --git a/sql/sql_repl.h b/sql/sql_repl.h index eec85826da4..ba64e626adc 100644 --- a/sql/sql_repl.h +++ b/sql/sql_repl.h @@ -17,9 +17,6 @@ #ifdef HAVE_REPLICATION #include "slave.h" -extern Rpl_filter *binlog_filter; -extern Rpl_filter *rpl_filter; - typedef struct st_slave_info { uint32 server_id; |