Merge 3.1 into 3.3

Author: dr-m

libmariadb/mariadb_lib.c

@@ -2342,7 +2342,7 @@ void my_set_error(MYSQL *mysql,
 {
   va_list ap;
 
-  const char *errmsg;
+  const char *errmsg= format;
 
   mysql->net.last_errno= error_nr;
   ma_strmake(mysql->net.sqlstate, sqlstate, SQLSTATE_LENGTH);
@@ -2359,8 +2359,7 @@ void my_set_error(MYSQL *mysql,
   }
 
   va_start(ap, format);
-  vsnprintf(mysql->net.last_error, MYSQL_ERRMSG_SIZE - 1,
-            format ? format : errmsg, ap);
+  vsnprintf(mysql->net.last_error, MYSQL_ERRMSG_SIZE - 1, errmsg, ap);
   va_end(ap);
   return;
 }

libmariadb/mariadb_stmt.c

@@ -92,7 +92,7 @@ void stmt_set_error(MYSQL_STMT *stmt,
 {
   va_list ap;
 
-  const char *errmsg;
+  const char *errmsg= format;
 
   stmt->last_errno= error_nr;
   ma_strmake(stmt->sqlstate, sqlstate, SQLSTATE_LENGTH);
@@ -118,8 +118,7 @@ void stmt_set_error(MYSQL_STMT *stmt,
   }
 
   va_start(ap, format);
-  vsnprintf(stmt->last_error, MYSQL_ERRMSG_SIZE - 1,
-            format ? format : errmsg, ap);
+  vsnprintf(stmt->last_error, MYSQL_ERRMSG_SIZE - 1, errmsg, ap);
   va_end(ap);
   return;
 }