bzr commit into mysql-6.0-backup branch (charles.bell:2747)

[Chuck Bell]

#At file:///D:/source/bzr/mysql-6.0-review/

 2747 Chuck Bell	2009-01-06
      Fix compiler warnings on sapsrv platforms.
modified:
  sql/si_objects.cc
  sql/si_objects.h
  sql/sql_repl.cc

=== modified file 'sql/si_objects.cc'
--- a/sql/si_objects.cc	2008-12-16 20:54:07 +0000
+++ b/sql/si_objects.cc	2009-01-06 15:27:00 +0000
@@ -3146,14 +3146,14 @@ int disable_slave_connections(bool disab
   @param[in] block  TRUE = block slave start, FALSE = do not block
   @param[in] reason  Reason for the block
 */
-void block_replication(bool block, char *reason)
+void block_replication(bool block, const char *reason)
 {
   pthread_mutex_lock(&LOCK_slave_start);
   allow_slave_start= !block;
   if (block)
   {
     reason_slave_blocked.length= strlen(reason);
-    reason_slave_blocked.str= reason;
+    reason_slave_blocked.str= (char *)reason;
   }
   pthread_mutex_unlock(&LOCK_slave_start);
 }

=== modified file 'sql/si_objects.h'
--- a/sql/si_objects.h	2008-12-16 20:54:07 +0000
+++ b/sql/si_objects.h	2009-01-06 15:27:00 +0000
@@ -513,7 +513,7 @@ int disable_slave_connections(bool disab
   Set state where replication is blocked (TRUE) or not blocked (FALSE)
   from starting. Include reason for feedback to user.
 */
-void block_replication(bool block, char *reason);
+void block_replication(bool block, const char *reason);
 
 /**
   Enumeration of the incidents that can occur on the master.

=== modified file 'sql/sql_repl.cc'
--- a/sql/sql_repl.cc	2008-12-16 20:54:07 +0000
+++ b/sql/sql_repl.cc	2009-01-06 15:27:00 +0000
@@ -1001,7 +1001,7 @@ void init_slave_start()
   pthread_mutex_lock(&LOCK_slave_start);
   allow_slave_start= TRUE;
   reason_slave_blocked.length= 0;
-  reason_slave_blocked.str= "";
+  reason_slave_blocked.str= (char *)"";
   pthread_mutex_unlock(&LOCK_slave_start);
 }