WL#2472: Fixes according to review

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

sql/slave.h

@@ -27,8 +27,6 @@
 #define MAX_SLAVE_ERRMSG   1024
 #define MAX_SLAVE_ERROR    2000
 
-extern Rpl_filter *rpl_filter;
-
 /*****************************************************************************
 
   MySQL Replication

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)

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;