Portability fix

2 files changed, 9 insertions, 5 deletions

diff --git a/sql/slave.cc b/sql/slave.cc
index 956f21593e5..b473d8ab1e3 100644
--- a/sql/slave.cc
+++ b/sql/slave.cc
@@ -246,9 +246,10 @@ err:
 }
 
 /* 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");
diff --git a/sql/slave.h b/sql/slave.h
index 75e3e81e57f..34df17f2851 100644
--- a/sql/slave.h
+++ b/sql/slave.h
@@ -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);