Automatic merge with 5.5

6 files changed, 8 insertions, 7 deletions

diff --git a/plugin/auth_pam/auth_pam.c b/plugin/auth_pam/auth_pam.c
index d8211294910..4f549142e72 100644
--- a/plugin/auth_pam/auth_pam.c
+++ b/plugin/auth_pam/auth_pam.c
@@ -107,7 +107,7 @@ static int conv(int n, const struct pam_message **msg,
 
 #define DO(X) if ((status = (X)) != PAM_SUCCESS) goto end
 
-#ifdef SOLARIS
+#if defined(SOLARIS) || defined(__sun)
 typedef void** pam_get_item_3_arg;
 #else
 typedef const void** pam_get_item_3_arg;
diff --git a/plugin/semisync/semisync.cc b/plugin/semisync/semisync.cc
index 83c7791c14b..022773eed0a 100644
--- a/plugin/semisync/semisync.cc
+++ b/plugin/semisync/semisync.cc
@@ -26,5 +26,5 @@ const unsigned long Trace::kTraceDetail   = 0x0010;
 const unsigned long Trace::kTraceNetWait  = 0x0020;
 const unsigned long Trace::kTraceFunction = 0x0040;
 
-const char  ReplSemiSyncBase::kSyncHeader[2] =
+const unsigned char  ReplSemiSyncBase::kSyncHeader[2] =
   {ReplSemiSyncBase::kPacketMagicNum, 0};
diff --git a/plugin/semisync/semisync.h b/plugin/semisync/semisync.h
index 57353f3c156..900ce5d8bf9 100644
--- a/plugin/semisync/semisync.h
+++ b/plugin/semisync/semisync.h
@@ -71,7 +71,7 @@ public:
 class ReplSemiSyncBase
   :public Trace {
 public:
-  static const char  kSyncHeader[2];              /* three byte packet header */
+  static const unsigned char  kSyncHeader[2];     /* three byte packet header */
 
   /* Constants in network packet header. */
   static const unsigned char kPacketMagicNum;
diff --git a/plugin/semisync/semisync_master.cc b/plugin/semisync/semisync_master.cc
index 3fef4b67aac..f8eb962b857 100644
--- a/plugin/semisync/semisync_master.cc
+++ b/plugin/semisync/semisync_master.cc
@@ -1049,11 +1049,12 @@ int ReplSemiSyncMaster::readSlaveReply(NET *net, uint32 server_id,
   ulong    log_file_len = 0;
   ulong    packet_len;
   int      result = -1;
-
   struct timespec start_ts;
   ulong trc_level = trace_level_;
   LINT_INIT_STRUCT(start_ts);
 
+  LINT_INIT_STRUCT(start_ts);
+
   function_enter(kWho);
 
   assert((unsigned char)event_buf[1] == kPacketMagicNum);
diff --git a/plugin/semisync/semisync_master_plugin.cc b/plugin/semisync/semisync_master_plugin.cc
index 9a325018242..b6ff23cd1ad 100644
--- a/plugin/semisync/semisync_master_plugin.cc
+++ b/plugin/semisync/semisync_master_plugin.cc
@@ -180,7 +180,7 @@ static MYSQL_SYSVAR_ULONG(timeout, rpl_semi_sync_master_timeout,
  "The timeout value (in ms) for semi-synchronous replication in the master",
   NULL, 			// check
   fix_rpl_semi_sync_master_timeout,	// update
-  10000, 0, ~0L, 1);
+  10000, 0, ~0UL, 1);
 
 static MYSQL_SYSVAR_BOOL(wait_no_slave, rpl_semi_sync_master_wait_no_slave,
   PLUGIN_VAR_OPCMDARG,
@@ -194,7 +194,7 @@ static MYSQL_SYSVAR_ULONG(trace_level, rpl_semi_sync_master_trace_level,
  "The tracing level for semi-sync replication.",
   NULL,				  // check
   &fix_rpl_semi_sync_master_trace_level, // update
-  32, 0, ~0L, 1);
+  32, 0, ~0UL, 1);
 
 static SYS_VAR* semi_sync_master_system_vars[]= {
   MYSQL_SYSVAR(enabled),
diff --git a/plugin/semisync/semisync_slave_plugin.cc b/plugin/semisync/semisync_slave_plugin.cc
index d5472b9cc83..5d373fa0862 100644
--- a/plugin/semisync/semisync_slave_plugin.cc
+++ b/plugin/semisync/semisync_slave_plugin.cc
@@ -161,7 +161,7 @@ static MYSQL_SYSVAR_ULONG(trace_level, rpl_semi_sync_slave_trace_level,
  "The tracing level for semi-sync replication.",
   NULL,				  // check
   &fix_rpl_semi_sync_trace_level, // update
-  32, 0, ~0L, 1);
+  32, 0, ~0UL, 1);
 
 static SYS_VAR* semi_sync_slave_system_vars[]= {
   MYSQL_SYSVAR(enabled),