Commit 7d276c3b authored by monty@hundin.mysql.fi's avatar monty@hundin.mysql.fi
Browse files

Portability fix

parent c8712a5b

sql/slave.cc

+8 −4
Original line number Diff line number Diff line
@@ -246,9 +246,10 @@ int init_relay_log_pos(RELAY_LOG_INFO* rli,const char* log, 
}



/* 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;

  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)

{

  DBUG_ENTER("purge_relay_logs");

sql/slave.h

+1 −1
Original line number Diff line number Diff line
@@ -333,7 +333,7 @@ typedef struct st_table_rule_ent 
#define SLAVE_FORCE_ALL 4



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_relay_log_info(RELAY_LOG_INFO* rli);

int register_slave_on_master(MYSQL* mysql);