mirror of
				https://github.com/MariaDB/server.git
				synced 2025-11-03 14:33:32 +03:00 
			
		
		
		
	WL#2472: Fixes according to review
This commit is contained in:
		@@ -14,8 +14,8 @@
 | 
				
			|||||||
   along with this program; if not, write to the Free Software
 | 
					   along with this program; if not, write to the Free Software
 | 
				
			||||||
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 | 
					   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#ifndef __RPL_FILTER_H__
 | 
					#ifndef RPL_FILTER_H
 | 
				
			||||||
#define __RPL_FILTER_H__
 | 
					#define RPL_FILTER_H
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#include "mysql.h"
 | 
					#include "mysql.h"
 | 
				
			||||||
#include "my_list.h"
 | 
					#include "my_list.h"
 | 
				
			||||||
@@ -107,4 +107,7 @@ private:
 | 
				
			|||||||
  I_List<i_string_pair> rewrite_db;
 | 
					  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
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -27,8 +27,6 @@
 | 
				
			|||||||
#define MAX_SLAVE_ERRMSG   1024
 | 
					#define MAX_SLAVE_ERRMSG   1024
 | 
				
			||||||
#define MAX_SLAVE_ERROR    2000
 | 
					#define MAX_SLAVE_ERROR    2000
 | 
				
			||||||
 | 
					
 | 
				
			||||||
extern Rpl_filter *rpl_filter;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
/*****************************************************************************
 | 
					/*****************************************************************************
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  MySQL Replication
 | 
					  MySQL Replication
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -15,7 +15,6 @@
 | 
				
			|||||||
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 | 
					   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#include "slave.h" // for tables_ok(), rpl_filter
 | 
					#include "slave.h" // for tables_ok(), rpl_filter
 | 
				
			||||||
extern Rpl_filter *rpl_filter;
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
#define SELECT_ACL	(1L << 0)
 | 
					#define SELECT_ACL	(1L << 0)
 | 
				
			||||||
#define INSERT_ACL	(1L << 1)
 | 
					#define INSERT_ACL	(1L << 1)
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -17,9 +17,6 @@
 | 
				
			|||||||
#ifdef HAVE_REPLICATION
 | 
					#ifdef HAVE_REPLICATION
 | 
				
			||||||
#include "slave.h"
 | 
					#include "slave.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
extern Rpl_filter *binlog_filter;
 | 
					 | 
				
			||||||
extern Rpl_filter *rpl_filter;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
typedef struct st_slave_info
 | 
					typedef struct st_slave_info
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
  uint32 server_id;
 | 
					  uint32 server_id;
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user