Fix for build failures on Power8

sql/wsrep_sst.cc

@@ -411,11 +411,10 @@ static ssize_t sst_prepare_other (const char*  method,
                                   const char*  addr_in,
                                   const char** addr_out)
 {
-  ssize_t cmd_len= 1024;
-  char    cmd_str[cmd_len];
+  char  cmd_str[1024];
   const char* sst_dir= mysql_real_data_home;
 
-  int ret= snprintf (cmd_str, cmd_len,
+  int ret= snprintf (cmd_str, sizeof(cmd_str),
                      "wsrep_sst_%s "
                      WSREP_SST_OPT_ROLE" 'joiner' "
                      WSREP_SST_OPT_ADDR" '%s' "
@@ -426,7 +425,7 @@ static ssize_t sst_prepare_other (const char*  method,
                      method, addr_in, (sst_auth_real) ? sst_auth_real : "",
                      sst_dir, wsrep_defaults_file, (int)getpid());
 
-  if (ret < 0 || ret >= cmd_len)
+  if (ret < 0 || ret >= (int)sizeof(cmd_str))
   {
     WSREP_ERROR("sst_prepare_other(): snprintf() failed: %d", ret);
     return (ret < 0 ? ret : -EMSGSIZE);
@@ -678,7 +677,7 @@ static int sst_donate_mysqldump (const char*         addr,
     host_len = strlen (addr) + 1;
   }
 
-  char host[host_len];
+  char *host= (char *) alloca(host_len);
 
   strncpy (host, addr, host_len - 1);
   host[host_len - 1] = '\0';
@@ -698,7 +697,7 @@ static int sst_donate_mysqldump (const char*         addr,
     user_len = (auth) ? strlen (auth) + 1 : 1;
   }
 
-  char user[user_len];
+  char *user= (char *) alloca(user_len);
 
   strncpy (user, (auth) ? auth : "", user_len - 1);
   user[user_len - 1] = '\0';
@@ -706,12 +705,11 @@ static int sst_donate_mysqldump (const char*         addr,
   int ret = sst_mysqldump_check_addr (user, pswd, host, port);
   if (!ret)
   {
-    size_t cmd_len= 1024;
-    char   cmd_str[cmd_len];
+    char cmd_str[1024];
 
     if (!bypass && wsrep_sst_donor_rejects_queries) sst_reject_queries(TRUE);
 
-    snprintf (cmd_str, cmd_len,
+    snprintf (cmd_str, sizeof(cmd_str),
               "wsrep_sst_mysqldump "
               WSREP_SST_OPT_USER" '%s' "
               WSREP_SST_OPT_PSWD" '%s' "
@@ -808,11 +806,13 @@ static int sst_flush_tables(THD* thd)
   {
     WSREP_INFO("Tables flushed.");
     const char base_name[]= "tables_flushed";
+
     ssize_t const full_len= strlen(mysql_real_data_home) + strlen(base_name)+2;
-    char real_name[full_len];
-    sprintf(real_name, "%s/%s", mysql_real_data_home, base_name);
-    char tmp_name[full_len + 4];
-    sprintf(tmp_name, "%s.tmp", real_name);
+    char *real_name= (char *) alloca(full_len);
+    snprintf(real_name, (size_t) full_len, "%s/%s", mysql_real_data_home,
+             base_name);
+    char *tmp_name= (char *) alloca(full_len + 4);
+    snprintf(tmp_name, (size_t) full_len + 4, "%s.tmp", real_name);
 
     FILE* file= fopen(tmp_name, "w+");
     if (0 == file)
@@ -970,10 +970,9 @@ static int sst_donate_other (const char*   method,
                              wsrep_seqno_t seqno,
                              bool          bypass)
 {
-  ssize_t cmd_len = 4096;
-  char    cmd_str[cmd_len];
+  char cmd_str[4096];
 
-  int ret= snprintf (cmd_str, cmd_len,
+  int ret= snprintf (cmd_str, sizeof(cmd_str),
                      "wsrep_sst_%s "
                      WSREP_SST_OPT_ROLE" 'donor' "
                      WSREP_SST_OPT_ADDR" '%s' "
@@ -988,7 +987,7 @@ static int sst_donate_other (const char*   method,
                      uuid, (long long) seqno,
                      bypass ? " "WSREP_SST_OPT_BYPASS : "");
 
-  if (ret < 0 || ret >= cmd_len)
+  if (ret < 0 || ret >= (int) sizeof(cmd_str))
   {
     WSREP_ERROR("sst_donate_other(): snprintf() failed: %d", ret);
     return (ret < 0 ? ret : -EMSGSIZE);

wsrep/wsrep_loader.c

@@ -39,11 +39,10 @@ static wsrep_log_cb_t logger = default_logger;
 
 static int verify(const wsrep_t *wh, const char *iface_ver)
 {
-    const size_t msg_len = 128;
-    char msg[msg_len];
+    char msg[128];
 
 #define VERIFY(_p) if (!(_p)) {                                       \
-        snprintf(msg, msg_len, "wsrep_load(): verify(): %s\n", # _p); \
+        snprintf(msg, sizeof(msg), "wsrep_load(): verify(): %s\n", # _p); \
         logger (WSREP_LOG_ERROR, msg);                                \
         return EINVAL;                                                \
     }
@@ -52,7 +51,7 @@ static int verify(const wsrep_t *wh, const char *iface_ver)
     VERIFY(wh->version);
 
     if (strcmp(wh->version, iface_ver)) {
-        snprintf (msg, msg_len,
+        snprintf (msg, sizeof(msg),
                   "provider interface version mismatch: need '%s', found '%s'",
                   iface_ver, wh->version);
         logger (WSREP_LOG_ERROR, msg);
@@ -115,9 +114,7 @@ int wsrep_load(const char *spec, wsrep_t **hptr, wsrep_log_cb_t log_cb)
     int ret = 0;
     void *dlh = NULL;
     wsrep_loader_fun dlfun;
-    const size_t msg_len = 1024;
-    char msg[msg_len + 1];
-    msg[msg_len] = 0;
+    char msg[1024];
 
     if (NULL != log_cb)
         logger = log_cb;
@@ -125,7 +122,7 @@ int wsrep_load(const char *spec, wsrep_t **hptr, wsrep_log_cb_t log_cb)
     if (!(spec && hptr))
         return EINVAL;
 
-    snprintf (msg, msg_len,
+    snprintf (msg, sizeof(msg),
               "wsrep_load(): loading provider library '%s'", spec);
     logger (WSREP_LOG_INFO, msg);
 
@@ -143,7 +140,7 @@ int wsrep_load(const char *spec, wsrep_t **hptr, wsrep_log_cb_t log_cb)
     }
 
     if (!(dlh = dlopen(spec, RTLD_NOW | RTLD_LOCAL))) {
-        snprintf(msg, msg_len, "wsrep_load(): dlopen(): %s", dlerror());
+        snprintf(msg, sizeof(msg), "wsrep_load(): dlopen(): %s", dlerror());
         logger (WSREP_LOG_ERROR, msg);
         ret = EINVAL;
         goto out;
@@ -155,14 +152,14 @@ int wsrep_load(const char *spec, wsrep_t **hptr, wsrep_log_cb_t log_cb)
     }
 
     if ((ret = (*dlfun)(*hptr)) != 0) {
-        snprintf(msg, msg_len, "wsrep_load(): loader failed: %s",
+        snprintf(msg, sizeof(msg), "wsrep_load(): loader failed: %s",
                  strerror(ret));
         logger (WSREP_LOG_ERROR, msg);
         goto out;
     }
 
     if ((ret = verify(*hptr, WSREP_INTERFACE_VERSION)) != 0) {
-        snprintf (msg, msg_len,
+        snprintf (msg, sizeof(msg),
                   "wsrep_load(): interface version mismatch: my version %s, "
                   "provider version %s", WSREP_INTERFACE_VERSION,
                   (*hptr)->version);
@@ -178,7 +175,7 @@ out:
         free(*hptr);
         *hptr = NULL;
     } else {
-        snprintf (msg, msg_len,
+        snprintf (msg, sizeof(msg),
                   "wsrep_load(): %s %s by %s loaded successfully.",
                   (*hptr)->provider_name, (*hptr)->provider_version,
                   (*hptr)->provider_vendor);