database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Portability fix

Browse Source
This commit is contained in:
unknown
2002-04-30 16:40:46 +03:00
parent b6a02149f7
commit 60e90ef61e
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sql/slave.cc
View File

@ -246,9 +246,10 @@ err:
} }
/* called from get_options() in mysqld.cc on start-up */ /* called from get_options() in mysqld.cc on start-up */
void init_slave_skip_errors(char* arg)
void init_slave_skip_errors(const char* arg)
{ {
char* p; const char *p;
my_bool last_was_digit = 0; my_bool last_was_digit = 0;
if (bitmap_init(&slave_error_mask,MAX_SLAVE_ERROR,0)) if (bitmap_init(&slave_error_mask,MAX_SLAVE_ERROR,0))
{ {
@ -275,8 +276,11 @@ void init_slave_skip_errors(char* arg)
} }
} }
// we assume we have a run lock on rli and that the both slave thread /*
// are not running We assume we have a run lock on rli and that the both slave thread
are not running
*/
int purge_relay_logs(RELAY_LOG_INFO* rli, bool just_reset, const char** errmsg) int purge_relay_logs(RELAY_LOG_INFO* rli, bool just_reset, const char** errmsg)
{ {
DBUG_ENTER("purge_relay_logs"); DBUG_ENTER("purge_relay_logs");

2
sql/slave.h
View File

@ -333,7 +333,7 @@ typedef struct st_table_rule_ent
#define SLAVE_FORCE_ALL 4 #define SLAVE_FORCE_ALL 4
int init_slave(); int init_slave();
void init_slave_skip_errors(char* arg); void init_slave_skip_errors(const char* arg);
int flush_master_info(MASTER_INFO* mi); int flush_master_info(MASTER_INFO* mi);
int flush_relay_log_info(RELAY_LOG_INFO* rli); int flush_relay_log_info(RELAY_LOG_INFO* rli);
int register_slave_on_master(MYSQL* mysql); int register_slave_on_master(MYSQL* mysql);