Merge branch '10.4' into 10.5

21 files changed, 331 insertions, 201 deletions

diff --git a/storage/connect/array.cpp b/storage/connect/array.cpp
index a5c2e065742..1eeb4ac05ca 100644
--- a/storage/connect/array.cpp
+++ b/storage/connect/array.cpp
@@ -975,13 +975,13 @@ PSZ ARRAY::MakeArrayList(PGLOBAL g)
 
   xtrc(1, "Arraylist: len=%d\n", len);
   p = (char *)PlugSubAlloc(g, NULL, len);
-  strcpy(p, "(");
+  safe_strcpy(p, len, "(");
 
   for (i = 0; i < Nval;) {
     Value->SetValue_pvblk(Vblp, i);
     Value->Prints(g, tp, z);
-    strcat(p, tp);
-    strcat(p, (++i == Nval) ? ")" : ",");
+    safe_strcat(p, len, tp);
+    safe_strcat(p, len, (++i == Nval) ? ")" : ",");
   } // enfor i
 
   xtrc(1, "Arraylist: newlen=%d\n", strlen(p));
diff --git a/storage/connect/bson.cpp b/storage/connect/bson.cpp
index 1eef3c063d6..6bea4eb5d85 100644
--- a/storage/connect/bson.cpp
+++ b/storage/connect/bson.cpp
@@ -10,6 +10,7 @@
 /*  Include relevant sections of the MariaDB header file.              */
 /***********************************************************************/
 #include <my_global.h>
+#include <m_string.h>
 
 /***********************************************************************/
 /*  Include application header files:                                  */
@@ -598,7 +599,7 @@ PSZ BDOC::Serialize(PGLOBAL g, PBVAL bvp, char* fn, int pretty)
 
   try {
     if (!bvp) {
-      strcpy(g->Message, "Null json tree");
+      safe_strcpy(g->Message, sizeof(g->Message), "Null json tree");
       throw 1;
     } else if (!fn) {
       // Serialize to a string
@@ -606,9 +607,8 @@ PSZ BDOC::Serialize(PGLOBAL g, PBVAL bvp, char* fn, int pretty)
       b = pretty == 1;
     } else {
       if (!(fs = fopen(fn, "wb"))) {
-        snprintf(g->Message, sizeof(g->Message), MSG(OPEN_MODE_ERROR),
-          "w", (int)errno, fn);
-        strcat(strcat(g->Message, ": "), strerror(errno));
+        snprintf(g->Message, sizeof(g->Message), MSG(OPEN_MODE_ERROR) ": %s",
+          "w", (int)errno, fn, strerror(errno));
         throw 2;
       } else if (pretty >= 2) {
         // Serialize to a pretty file
diff --git a/storage/connect/bsonudf.cpp b/storage/connect/bsonudf.cpp
index b67fb0232d5..439f5a16c70 100644
--- a/storage/connect/bsonudf.cpp
+++ b/storage/connect/bsonudf.cpp
@@ -4910,7 +4910,7 @@ char *bbin_make_array(UDF_INIT *initid, UDF_ARGS *args, char *result,
 			} // endfor i
 
 			if ((bsp = BbinAlloc(bnx.G, initid->max_length, arp))) {
-				strcat(bsp->Msg, " array");
+				safe_strcat(bsp->Msg, sizeof(bsp->Msg), " array");
 
 				// Keep result of constant function
 				g->Xchk = (initid->const_item) ? bsp : NULL;
@@ -5108,8 +5108,9 @@ char *bbin_array_grp(UDF_INIT *initid, UDF_ARGS *, char *result,
 		PUSH_WARNING("Result truncated to json_grp_size values");
 
 	if (arp)
-		if ((bsp = BbinAlloc(g, initid->max_length, arp)))
-			strcat(bsp->Msg, " array");
+		if ((bsp = BbinAlloc(g, initid->max_length, arp))) {
+                        safe_strcat(bsp->Msg, sizeof(bsp->Msg), " array");
+        }
 
 	if (!bsp) {
 		*res_length = 0;
@@ -5155,8 +5156,9 @@ char *bbin_object_grp(UDF_INIT *initid, UDF_ARGS *, char *result,
 		PUSH_WARNING("Result truncated to json_grp_size values");
 
 	if (bop)
-		if ((bsp = BbinAlloc(g, initid->max_length, bop)))
-			strcat(bsp->Msg, " object");
+		if ((bsp = BbinAlloc(g, initid->max_length, bop))) {
+			safe_strcat(bsp->Msg, sizeof(bsp->Msg), " object");
+		}
 
 	if (!bsp) {
 		*res_length = 0;
@@ -5200,7 +5202,7 @@ char *bbin_make_object(UDF_INIT *initid, UDF_ARGS *args, char *result,
 					bnx.SetKeyValue(objp, bnx.MakeValue(args, i), bnx.MakeKey(args, i));
 
 				if ((bsp = BbinAlloc(bnx.G, initid->max_length, objp))) {
-					strcat(bsp->Msg, " object");
+					safe_strcat(bsp->Msg, sizeof(bsp->Msg), " object");
 
 					// Keep result of constant function
 					g->Xchk = (initid->const_item) ? bsp : NULL;
@@ -5255,7 +5257,7 @@ char *bbin_object_nonull(UDF_INIT *initid, UDF_ARGS *args, char *result,
 						bnx.SetKeyValue(objp, jvp, bnx.MakeKey(args, i));
 
 				if ((bsp = BbinAlloc(bnx.G, initid->max_length, objp)))	{
-					strcat(bsp->Msg, " object");
+					safe_strcat(bsp->Msg, sizeof(bsp->Msg), " object");
 
 					// Keep result of constant function
 					g->Xchk = (initid->const_item) ? bsp : NULL;
@@ -5314,7 +5316,7 @@ char *bbin_object_key(UDF_INIT *initid, UDF_ARGS *args, char *result,
 					bnx.SetKeyValue(objp, bnx.MakeValue(args, i + 1), MakePSZ(g, args, i));
 
 				if ((bsp = BbinAlloc(bnx.G, initid->max_length, objp))) {
-					strcat(bsp->Msg, " object");
+					safe_strcat(bsp->Msg, sizeof(bsp->Msg), " object");
 
 					// Keep result of constant function
 					g->Xchk = (initid->const_item) ? bsp : NULL;
@@ -6077,7 +6079,7 @@ char *bbin_file(UDF_INIT *initid, UDF_ARGS *args, char *result,
 //		pretty = pty;
 
 	if ((bsp = BbinAlloc(bnx.G, len, jsp))) {
-		strcat(bsp->Msg, " file");
+		safe_strcat(bsp->Msg, sizeof(bsp->Msg), " file");
 		bsp->Filename = fn;
 		bsp->Pretty = pretty;
 	} else {
diff --git a/storage/connect/filamdbf.cpp b/storage/connect/filamdbf.cpp
index 98efd635bf3..4649e36a69e 100644
--- a/storage/connect/filamdbf.cpp
+++ b/storage/connect/filamdbf.cpp
@@ -442,7 +442,7 @@ PQRYRES DBFColumns(PGLOBAL g, PCSZ dp, PCSZ fn, PTOS topt, bool info)
       hp->Headlen, hp->Filedate[0], hp->Filedate[1],
       hp->Filedate[2]);
 
-    strcat(g->Message, buf);
+    safe_strcat(g->Message, sizeof(g->Message), buf);
     } // endif info
 #endif // 0
 
diff --git a/storage/connect/filamfix.cpp b/storage/connect/filamfix.cpp
index 117a4e8dda6..3298a83394c 100644
--- a/storage/connect/filamfix.cpp
+++ b/storage/connect/filamfix.cpp
@@ -36,6 +36,8 @@
 #include <fcntl.h>
 #endif  // !_WIN32
 
+#include <m_string.h>
+
 /***********************************************************************/
 /*  Include application header files:                                  */
 /*  global.h    is header containing all global declarations.          */
@@ -881,7 +883,6 @@ bool BGXFAM::OpenTableFile(PGLOBAL g)
     FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM |
                   FORMAT_MESSAGE_IGNORE_INSERTS, NULL, rc, 0,
                   (LPTSTR)filename, sizeof(filename), NULL);
-    strcat(g->Message, filename);
   } else
     rc = 0;
 
@@ -1002,7 +1003,7 @@ int BGXFAM::Cardinality(PGLOBAL g)
           FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM |
                         FORMAT_MESSAGE_IGNORE_INSERTS, NULL, rc, 0,
                         (LPTSTR)filename, sizeof(filename), NULL);
-          strcat(g->Message, filename);
+          safe_strcat(g->Message, sizeof(g->Message), filename);
           return -1;
         } else
           return 0;                     // File does not exist
@@ -1382,7 +1383,8 @@ bool BGXFAM::OpenTempFile(PGLOBAL g)
   /*********************************************************************/
   tempname = (char*)PlugSubAlloc(g, NULL, _MAX_PATH);
   PlugSetPath(tempname, To_File, Tdbp->GetPath());
-  strcat(PlugRemoveType(tempname, tempname), ".t");
+  PlugRemoveType(tempname, tempname);
+  safe_strcat(tempname, _MAX_PATH, ".t");
   remove(tempname);       // Be sure it does not exist yet
 
 #if defined(_WIN32)
@@ -1391,11 +1393,12 @@ bool BGXFAM::OpenTempFile(PGLOBAL g)
 
   if (Tfile == INVALID_HANDLE_VALUE) {
     DWORD rc = GetLastError();
-    snprintf(g->Message, sizeof(g->Message), MSG(OPEN_ERROR), rc, MODE_INSERT, tempname);
+    snprintf(g->Message, sizeof(g->Message), MSG(OPEN_ERROR), rc, MODE_INSERT,
+             tempname);
     FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM |
               FORMAT_MESSAGE_IGNORE_INSERTS, NULL, rc, 0,
               (LPTSTR)tempname, _MAX_PATH, NULL);
-    strcat(g->Message, tempname);
+    safe_strcat(g->Message, sizeof(g->Message), tempname);
     return true;
     } // endif Tfile
 #else    // UNIX
@@ -1403,8 +1406,8 @@ bool BGXFAM::OpenTempFile(PGLOBAL g)
 
   if (Tfile == INVALID_HANDLE_VALUE) {
     int rc = errno;
-    snprintf(g->Message, sizeof(g->Message), MSG(OPEN_ERROR), rc, MODE_INSERT, tempname);
-    strcat(g->Message, strerror(errno));
+    snprintf(g->Message, sizeof(g->Message), MSG(OPEN_ERROR)" %s", rc,
+             MODE_INSERT, tempname, strerror(errno));
     return true;
     } //endif Tfile
 #endif   // UNIX
diff --git a/storage/connect/filamgz.cpp b/storage/connect/filamgz.cpp
index d6c48cb25a9..0eaf3571a80 100644
--- a/storage/connect/filamgz.cpp
+++ b/storage/connect/filamgz.cpp
@@ -33,6 +33,8 @@
 #include <fcntl.h>
 #endif  // !_WIN32
 
+#include <m_string.h>
+
 /***********************************************************************/
 /*  Include application header files:                                  */
 /*  global.h    is header containing all global declarations.          */
@@ -128,12 +130,13 @@ int GZFAM::GetFileLength(PGLOBAL g)
 /***********************************************************************/
 bool GZFAM::OpenTableFile(PGLOBAL g)
   {
-  char    opmode[4], filename[_MAX_PATH];
-  MODE    mode = Tdbp->GetMode();
+  const char *opmode;
+  char filename[_MAX_PATH];
+  MODE mode = Tdbp->GetMode();
 
   switch (mode) {
     case MODE_READ:
-      strcpy(opmode, "r");
+      opmode = "rb";
       break;
     case MODE_UPDATE:
       /*****************************************************************/
@@ -147,7 +150,7 @@ bool GZFAM::OpenTableFile(PGLOBAL g)
         DelRows = Cardinality(g);
 
         // This will erase the entire file
-        strcpy(opmode, "w");
+        opmode = "wb";
 //      Block = 0;                // For ZBKFAM
 //      Last = Nrec;              // For ZBKFAM
         Tdbp->ResetSize();
@@ -158,7 +161,7 @@ bool GZFAM::OpenTableFile(PGLOBAL g)
 
       break;
     case MODE_INSERT:
-      strcpy(opmode, "a+");
+      opmode = "a+b";
       break;
     default:
       snprintf(g->Message, sizeof(g->Message), MSG(BAD_OPEN_MODE), mode);
@@ -170,13 +173,11 @@ bool GZFAM::OpenTableFile(PGLOBAL g)
   /*  Use specific zlib functions.                                     */
   /*  Treat files as binary.                                           */
   /*********************************************************************/
-  strcat(opmode, "b");
   Zfile = gzopen(PlugSetPath(filename, To_File, Tdbp->GetPath()), opmode);
 
   if (Zfile == NULL) {
-    snprintf(g->Message, sizeof(g->Message), MSG(GZOPEN_ERROR),
-            opmode, (int)errno, filename);
-    strcat(strcat(g->Message, ": "), strerror(errno));
+    snprintf(g->Message, sizeof(g->Message), MSG(GZOPEN_ERROR) ": %s",
+            opmode, (int)errno, filename, strerror(errno));
     return (mode == MODE_READ && errno == ENOENT)
             ? PushWarning(g, Tdbp) : true;
     } // endif Zfile
diff --git a/storage/connect/filamtxt.cpp b/storage/connect/filamtxt.cpp
index 7a5d16accb2..f8168887e89 100644
--- a/storage/connect/filamtxt.cpp
+++ b/storage/connect/filamtxt.cpp
@@ -38,6 +38,8 @@
 #include <fcntl.h>
 #endif  // !_WIN32
 
+#include <m_string.h>
+
 /***********************************************************************/
 /*  Include application header files:                                  */
 /*  global.h    is header containing all global declarations.          */
@@ -593,7 +595,7 @@ bool DOSFAM::OpenTableFile(PGLOBAL g)
     } // endswitch Mode
 
   // For blocked I/O or for moving lines, open the table in binary
-  strcat(opmode, (Bin) ? "b" : "t");
+  safe_strcat(opmode, sizeof(opmode), (Bin) ? "b" : "t");
 
   // Now open the file stream
   PlugSetPath(filename, To_File, Tdbp->GetPath());
@@ -1081,7 +1083,8 @@ bool DOSFAM::OpenTempFile(PGLOBAL g)
   /*  Open the temporary file, Spos is at the beginning of file.       */
   /*********************************************************************/
   PlugSetPath(tempname, To_File, Tdbp->GetPath());
-  strcat(PlugRemoveType(tempname, tempname), ".t");
+  PlugRemoveType(tempname, tempname);
+  safe_strcat(tempname, sizeof(tempname), ".t");
 
   if (!(T_Stream = PlugOpenFile(g, tempname, "wb"))) {
     if (trace(1))
@@ -1170,7 +1173,8 @@ int DOSFAM::RenameTempFile(PGLOBAL g)
   
   if (!Abort) {
     PlugSetPath(filename, To_File, Tdbp->GetPath());
-    strcat(PlugRemoveType(filetemp, filename), ".ttt");
+    PlugRemoveType(filetemp, filename);
+    safe_strcat(filetemp, sizeof(filetemp), ".ttt");
     remove(filetemp);   // May still be there from previous error
 
     if (rename(filename, filetemp)) {    // Save file for security
diff --git a/storage/connect/filamvct.cpp b/storage/connect/filamvct.cpp
index 76e9336dedf..184df646cb7 100644
--- a/storage/connect/filamvct.cpp
+++ b/storage/connect/filamvct.cpp
@@ -42,6 +42,8 @@
 #include <fcntl.h>
 #endif  // !_WIN32
 
+#include <m_string.h>
+
 /***********************************************************************/
 /*  Include application header files:                                  */
 /*  global.h    is header containing all global declarations.          */
@@ -194,7 +196,7 @@ int VCTFAM::GetBlockInfo(PGLOBAL g)
   if (Header == 2)
   {
     PlugRemoveType(filename, filename);
-    strncat(filename, ".blk", _MAX_PATH - strlen(filename));
+    safe_strcat(filename, sizeof(filename), ".blk");
   }
 
   if ((h = global_open(g, MSGID_CANNOT_OPEN, filename, O_RDONLY)) == -1
@@ -251,7 +253,7 @@ bool VCTFAM::SetBlockInfo(PGLOBAL g)
 
   } else {      // Header == 2
     PlugRemoveType(filename, filename);
-    strncat(filename, ".blk", _MAX_PATH - strlen(filename));
+    safe_strcat(filename, sizeof(filename), ".blk");
     s= global_fopen(g, MSGID_CANNOT_OPEN, filename, "wb");
   } // endif Header
 
@@ -587,7 +589,7 @@ bool VCTFAM::InitInsert(PGLOBAL g)
 				htrc("Exception %d: %s\n", n, g->Message);
 			rc = true;
 		} catch (const char *msg) {
-			strncpy(g->Message, msg, sizeof(g->Message));
+			safe_strcpy(g->Message, sizeof(msg), msg);
 			rc = true;
 		} // end catch
 
@@ -891,8 +893,7 @@ bool VCTFAM::OpenTempFile(PGLOBAL g)
   /*********************************************************************/
   PlugSetPath(tempname, To_File, Tdbp->GetPath());
   PlugRemoveType(tempname, tempname);
-  strncat(tempname, ".t", _MAX_PATH - strlen(tempname));
-
+  safe_strcat(tempname, sizeof(tempname), ".t");
   if (MaxBlk) {
     if (MakeEmptyFile(g, tempname))
       return true;
@@ -1562,7 +1563,7 @@ bool VCMFAM::InitInsert(PGLOBAL g)
 		  htrc("Exception %d: %s\n", n, g->Message);
 		rc = true;
   } catch (const char *msg) {
-	  strncpy(g->Message, msg, sizeof(g->Message));
+	  safe_strcpy(g->Message, sizeof(g->Message), msg);
 		rc = true;
   } // end catch
 
@@ -2082,10 +2083,10 @@ bool VECFAM::AllocateBuffer(PGLOBAL g)
       // Allocate all that is needed to move lines and make Temp
       if (UseTemp) {
         Tempat = (char*)PlugSubAlloc(g, NULL, _MAX_PATH);
-        strcpy(Tempat, Colfn);
+        safe_strcpy(Tempat, _MAX_PATH, Colfn);
         PlugSetPath(Tempat, Tempat, Tdbp->GetPath());
         PlugRemoveType(Tempat, Tempat);
-        strncat(Tempat, ".t", _MAX_PATH - strlen(Tempat));
+        safe_strcat(Tempat, _MAX_PATH, ".t");
         T_Fbs = (PFBLOCK *)PlugSubAlloc(g, NULL, Ncol * sizeof(PFBLOCK));
         } // endif UseTemp
 
@@ -2460,7 +2461,7 @@ int VECFAM::RenameTempFile(PGLOBAL g)
       snprintf(filename, _MAX_PATH, Colfn, i+1);
       PlugSetPath(filename, filename, Tdbp->GetPath());
       PlugRemoveType(filetemp, filename);
-      strncat(filetemp, ".ttt", _MAX_PATH - strlen(filetemp));
+      safe_strcat(filetemp, sizeof(filetemp), ".ttt");
       remove(filetemp);   // May still be there from previous error
   
       if (rename(filename, filetemp)) {    // Save file for security
@@ -3221,7 +3222,7 @@ int BGVFAM::GetBlockInfo(PGLOBAL g)
   if (Header == 2)
   {
     PlugRemoveType(filename, filename);
-    strncat(filename, ".blk", _MAX_PATH - strlen(filename));
+    safe_strcat(filename, sizeof(filename), ".blk");
   }
 
 #if defined(_WIN32)
@@ -3300,7 +3301,7 @@ bool BGVFAM::SetBlockInfo(PGLOBAL g)
   } else       // Header == 2
   {
     PlugRemoveType(filename, filename);
-    strncat(filename, ".blk", _MAX_PATH - strlen(filename));
+    safe_strcat(filename, sizeof(filename), ".blk");
   }
 
   if (h == INVALID_HANDLE_VALUE) {
@@ -3398,7 +3399,7 @@ bool BGVFAM::MakeEmptyFile(PGLOBAL g, PCSZ fn)
   FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM |
                 FORMAT_MESSAGE_IGNORE_INSERTS, NULL, rc, 0,
                 (LPTSTR)filename, sizeof(filename), NULL);
-  strncat(g->Message, filename, sizeof(g->Message) - strlen(g->Message));
+  safe_strcat(g->Message, sizeof(g->Message), filename);
 
   if (h != INVALID_HANDLE_VALUE)
     CloseHandle(h);
@@ -3534,7 +3535,7 @@ bool BGVFAM::OpenTableFile(PGLOBAL g)
     FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM |
                   FORMAT_MESSAGE_IGNORE_INSERTS, NULL, rc, 0,
                   (LPTSTR)filename, sizeof(filename), NULL);
-    strncat(g->Message, filename, sizeof(g->Message) - strlen(g->Message));
+    safe_strcat(g->Message, sizeof(g->Message), filename);
     } // endif Hfile
 
   if (trace(1))
@@ -3622,8 +3623,8 @@ bool BGVFAM::OpenTableFile(PGLOBAL g)
 
   if (Hfile == INVALID_HANDLE_VALUE) {
     rc = errno;
-    snprintf(g->Message, sizeof(g->Message), MSG(OPEN_ERROR), rc, mode, filename);
-    strncat(g->Message, strerror(errno), sizeof(g->Message) - strlen(g->Message));
+    snprintf(g->Message, sizeof(g->Message), MSG(OPEN_ERROR)"%s", rc, mode,
+             filename, strerror(errno));
     } // endif Hfile
 
   if (trace(1))
@@ -3967,7 +3968,7 @@ bool BGVFAM::OpenTempFile(PGLOBAL g)
   tempname = (char*)PlugSubAlloc(g, NULL, _MAX_PATH);
   PlugSetPath(tempname, To_File, Tdbp->GetPath());
   PlugRemoveType(tempname, tempname);
-  strncat(tempname, ".t", _MAX_PATH - strlen(tempname));
+  safe_strcat(tempname, _MAX_PATH, ".t");
 
   if (!MaxBlk)
     remove(tempname);       // Be sure it does not exist yet
@@ -3986,7 +3987,7 @@ bool BGVFAM::OpenTempFile(PGLOBAL g)
     FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM |
               FORMAT_MESSAGE_IGNORE_INSERTS, NULL, rc, 0,
               (LPTSTR)tempname, _MAX_PATH, NULL);
-    strncat(g->Message, tempname, sizeof(g->Message) - strlen(g->Message));
+    safe_strcat(g->Message, sizeof(g->Message), tempname);
     return true;
     } // endif Tfile
 #else    // UNIX
@@ -3996,8 +3997,8 @@ bool BGVFAM::OpenTempFile(PGLOBAL g)
 
   if (Tfile == INVALID_HANDLE_VALUE) {
     int rc = errno;
-    snprintf(g->Message, sizeof(g->Message), MSG(OPEN_ERROR), rc, MODE_INSERT, tempname);
-    strncat(g->Message, strerror(errno), sizeof(g->Message) - strlen(g->Message));
+    snprintf(g->Message, sizeof(g->Message), MSG(OPEN_ERROR) "%s", rc, MODE_INSERT,
+             tempname, strerror(errno));
     return true;
     } //endif Tfile
 #endif   // UNIX
diff --git a/storage/connect/filamzip.cpp b/storage/connect/filamzip.cpp
index f0ee947bc23..5a1e40cccb2 100644
--- a/storage/connect/filamzip.cpp
+++ b/storage/connect/filamzip.cpp
@@ -29,6 +29,7 @@
 #include <fcntl.h>
 #endif  // !_WIN32
 #include <time.h>
+#include <m_string.h>
 
 /***********************************************************************/
 /*  Include application header files:                                  */
@@ -181,7 +182,8 @@ static bool ZipFiles(PGLOBAL g, ZIPUTIL *zutp, PCSZ pat, char *buf)
 
 	while (true) {
 		if (!(FileData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) {
-			strcat(strcat(strcpy(filename, drive), direc), FileData.cFileName);
+			snprintf(filename, sizeof(filename), "%s%s%s",
+				 drive, direc, FileData.cFileName);
 
 			if (ZipFile(g, zutp, filename, FileData.cFileName, buf)) {
 				FindClose(hSearch);
@@ -217,7 +219,7 @@ static bool ZipFiles(PGLOBAL g, ZIPUTIL *zutp, PCSZ pat, char *buf)
 	struct dirent *entry;
 
 	_splitpath(filename, NULL, direc, pattern, ftype);
-	strcat(pattern, ftype);
+	safe_strcat(pattern, sizeof(pattern), ftype);
 
 	// Start searching files in the target directory.
 	if (!(dir = opendir(direc))) {
@@ -226,7 +228,7 @@ static bool ZipFiles(PGLOBAL g, ZIPUTIL *zutp, PCSZ pat, char *buf)
 	} // endif dir
 
 	while ((entry = readdir(dir))) {
-		strcat(strcpy(fn, direc), entry->d_name);
+		snprintf(fn, sizeof(fn), "%s%s", direc, entry->d_name);
 
 		if (lstat(fn, &fileinfo) < 0) {
 			snprintf(g->Message, sizeof(g->Message), "%s: %s", fn, strerror(errno));
@@ -240,7 +242,7 @@ static bool ZipFiles(PGLOBAL g, ZIPUTIL *zutp, PCSZ pat, char *buf)
 		if (fnmatch(pattern, entry->d_name, 0))
 			continue;      // Not a match
 
-		strcat(strcpy(filename, direc), entry->d_name);
+		snprintf(filename, sizeof(filename), "%s%s", direc, entry->d_name);
 
 		if (ZipFile(g, zutp, filename, entry->d_name, buf)) {
 			closedir(dir);
diff --git a/storage/connect/javaconn.cpp b/storage/connect/javaconn.cpp
index bf104402628..efde2e86330 100644
--- a/storage/connect/javaconn.cpp
+++ b/storage/connect/javaconn.cpp
@@ -33,6 +33,8 @@
 #define NODW
 #endif  // !_WIN32
 
+#include <m_string.h>
+
 /***********************************************************************/
 /*  Required objects includes.                                         */
 /***********************************************************************/
@@ -231,15 +233,16 @@ bool JAVAConn::GetJVM(PGLOBAL g)
 #if defined(_WIN32)
 		for (ntry = 0; !LibJvm && ntry < 3; ntry++) {
 			if (!ntry && JvmPath) {
-				strcat(strcpy(soname, JvmPath), "\\jvm.dll");
+				snprintf(soname, sizeof(soname), "%s\\jvm.dll", JvmPath);
+
 				ntry = 3;		 // No other try
 			} else if (ntry < 2 && getenv("JAVA_HOME")) {
-				strcpy(soname, getenv("JAVA_HOME"));
+				safe_strcpy(soname, sizeof(soname), getenv("JAVA_HOME"));
 
 				if (ntry == 1)
-					strcat(soname, "\\jre");
+					safe_strcat(soname, sizeof(soname), "\\jre");
 
-				strcat(soname, "\\bin\\client\\jvm.dll");
+				safe_strcat(soname, sizeof(soname), "\\bin\\client\\jvm.dll");
 			} else {
 				// Try to find it through the registry
 				char version[16];
@@ -247,11 +250,12 @@ bool JAVAConn::GetJVM(PGLOBAL g)
 				LONG  rc;
 				DWORD BufferSize = 16;
 
-				strcpy(soname, "jvm.dll");		// In case it fails
+				safe_strcpy(soname, sizeof(soname), "jvm.dll");		// In case it fails
 
 				if ((rc = RegGetValue(HKEY_LOCAL_MACHINE, javaKey, "CurrentVersion",
 					RRF_RT_ANY, NULL, (PVOID)&version, &BufferSize)) == ERROR_SUCCESS) {
-					strcat(strcat(javaKey, "\\"), version);
+					safe_strcat(javaKey, sizeof(javaKey), "\\");
+					safe_strcat(javaKey, sizeof(javaKey), version);
 					BufferSize = sizeof(soname);
 
 					if ((rc = RegGetValue(HKEY_LOCAL_MACHINE, javaKey, "RuntimeLib",
@@ -272,11 +276,11 @@ bool JAVAConn::GetJVM(PGLOBAL g)
 			char  buf[256];
 			DWORD rc = GetLastError();
 
-			snprintf(g->Message, sizeof(g->Message), MSG(DLL_LOAD_ERROR), rc, soname);
 			FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM |
 										FORMAT_MESSAGE_IGNORE_INSERTS, NULL, rc, 0,
 				            (LPTSTR)buf, sizeof(buf), NULL);
-			strcat(strcat(g->Message, ": "), buf);
+			snprintf(g->Message, sizeof(g->Message), MSG(DLL_LOAD_ERROR)": %s", rc,
+							 soname, buf);
 		} else if (!(CreateJavaVM = (CRTJVM)GetProcAddress((HINSTANCE)LibJvm,
 			                                       "JNI_CreateJavaVM"))) {
 			snprintf(g->Message, sizeof(g->Message), MSG(PROCADD_ERROR), GetLastError(), "JNI_CreateJavaVM");
@@ -301,13 +305,14 @@ bool JAVAConn::GetJVM(PGLOBAL g)
 
 		for (ntry = 0; !LibJvm && ntry < 2; ntry++) {
 			if (!ntry && JvmPath) {
-				strcat(strcpy(soname, JvmPath), "/libjvm.so");
+				snprintf(soname, sizeof(soname), "%s/libjvm.so", JvmPath);
 				ntry = 2;
 			} else if (!ntry && getenv("JAVA_HOME")) {
 				// TODO: Replace i386 by a better guess
-				strcat(strcpy(soname, getenv("JAVA_HOME")), "/jre/lib/i386/client/libjvm.so");
+				snprintf(soname, sizeof(soname), "%s/jre/lib/i386/client/libjvm.so",
+								 getenv("JAVA_HOME"));
 			} else {	 // Will need LD_LIBRARY_PATH to be set
-				strcpy(soname, "libjvm.so");
+				safe_strcpy(soname, sizeof(soname), "libjvm.so");
 				ntry = 2;
 			} // endelse
 
diff --git a/storage/connect/json.cpp b/storage/connect/json.cpp
index 4078a03830a..a46d6001434 100644
--- a/storage/connect/json.cpp
+++ b/storage/connect/json.cpp
@@ -10,6 +10,7 @@
 /*  Include relevant sections of the MariaDB header file.              */
 /***********************************************************************/
 #include <my_global.h>
+#include <m_string.h>
 
 /***********************************************************************/
 /*  Include application header files:                                  */
@@ -270,7 +271,7 @@ PSZ Serialize(PGLOBAL g, PJSON jsp, char* fn, int pretty) {
     jdp->dfp = GetDefaultPrec();
 
     if (!jsp) {
-      strcpy(g->Message, "Null json tree");
+      safe_strcpy(g->Message, sizeof(g->Message), "Null json tree");
       throw 1;
     } else if (!fn) {
       // Serialize to a string
@@ -278,9 +279,8 @@ PSZ Serialize(PGLOBAL g, PJSON jsp, char* fn, int pretty) {
       b = pretty == 1;
     } else {
       if (!(fs = fopen(fn, "wb"))) {
-        snprintf(g->Message, sizeof(g->Message), MSG(OPEN_MODE_ERROR),
-          "w", (int)errno, fn);
-        strcat(strcat(g->Message, ": "), strerror(errno));
+        snprintf(g->Message, sizeof(g->Message), MSG(OPEN_MODE_ERROR) ": %s",
+                 "w", (int)errno, fn, strerror(errno));
         throw 2;
       } else if (pretty >= 2) {
         // Serialize to a pretty file
diff --git a/storage/connect/jsonudf.cpp b/storage/connect/jsonudf.cpp
index 0baaa70b496..f514e9ee806 100644
--- a/storage/connect/jsonudf.cpp
+++ b/storage/connect/jsonudf.cpp
@@ -4755,7 +4755,7 @@ char *jbin_array(UDF_INIT *initid, UDF_ARGS *args, char *result,
 
 			if ((arp = (PJAR)JsonNew(g, TYPE_JAR)) &&
 					(bsp = JbinAlloc(g, args, initid->max_length, arp))) {
-				strcat(bsp->Msg, " array");
+				safe_strcat(bsp->Msg, sizeof(bsp->Msg), " array");
 
 				for (uint i = 0; i < args->arg_count; i++)
 					arp->AddArrayValue(g, MakeValue(g, args, i));
@@ -4832,7 +4832,7 @@ char *jbin_array_add_values(UDF_INIT *initid, UDF_ARGS *args, char *result,
 			arp->InitArray(gb);
 
 			if ((bsp = JbinAlloc(g, args, initid->max_length, top))) {
-				strcat(bsp->Msg, " array");
+				safe_strcat(bsp->Msg, sizeof(bsp->Msg), " array");
 				bsp->Jsp = arp;
 			}	// endif bsp
 
@@ -5053,7 +5053,7 @@ char *jbin_object(UDF_INIT *initid, UDF_ARGS *args, char *result,
 
 
 				if ((bsp = JbinAlloc(g, args, initid->max_length, objp)))
-					strcat(bsp->Msg, " object");
+					safe_strcat(bsp->Msg, sizeof(bsp->Msg), " object");
 
 			} else
 				bsp = NULL;
@@ -5109,7 +5109,7 @@ char *jbin_object_nonull(UDF_INIT *initid, UDF_ARGS *args, char *result,
 						objp->SetKeyValue(g, jvp, MakeKey(g, args, i));
 
 				if ((bsp = JbinAlloc(g, args, initid->max_length, objp)))
-					strcat(bsp->Msg, " object");
+					safe_strcat(bsp->Msg, sizeof(bsp->Msg), " object");
 
 			} else
 				bsp = NULL;
@@ -5168,7 +5168,7 @@ char *jbin_object_key(UDF_INIT *initid, UDF_ARGS *args, char *result,
 					objp->SetKeyValue(g, MakeValue(g, args, i + 1), MakePSZ(g, args, i));
 
 				if ((bsp = JbinAlloc(g, args, initid->max_length, objp)))
-					strcat(bsp->Msg, " object");
+					safe_strcat(bsp->Msg, sizeof(bsp->Msg), " object");
 
 			} else
 				bsp = NULL;
@@ -5390,7 +5390,7 @@ char *jbin_object_list(UDF_INIT *initid, UDF_ARGS *args, char *result,
 		} // endif CheckMemory
 
 		if ((bsp = JbinAlloc(g, args, initid->max_length, jarp)))
-			strcat(bsp->Msg, " array");
+			safe_strcat(bsp->Msg, sizeof(bsp->Msg), " array");
 
 		// Keep result of constant function
 		g->Xchk = (initid->const_item) ? bsp : NULL;
@@ -5465,7 +5465,7 @@ char *jbin_get_item(UDF_INIT *initid, UDF_ARGS *args, char *result,
 		jsp = (jvp->GetJsp()) ? jvp->GetJsp() : JvalNew(g, TYPE_JVAL, jvp->GetValue(g));
 
 		if ((bsp = JbinAlloc(g, args, initid->max_length, jsp)))
-			strcat(bsp->Msg, " item");
+			safe_strcat(bsp->Msg, sizeof(bsp->Msg), " item");
 		else
 			*error = 1;
 
@@ -5825,7 +5825,7 @@ char *jbin_file(UDF_INIT *initid, UDF_ARGS *args, char *result,
 		pretty = pty;
 
 	if ((bsp = JbinAlloc(g, args, len, jsp))) {
-		strcat(bsp->Msg, " file");
+		safe_strcat(bsp->Msg, sizeof(bsp->Msg), " file");
 		bsp->Filename = fn;
 		bsp->Pretty = pretty;
 	} else {
@@ -6161,9 +6161,8 @@ char* JUP::UnprettyJsonFile(PGLOBAL g, char *fn, char *outfn, int lrecl) {
 	/*  Parse the json file and allocate its tree structure.                         */
 	/*********************************************************************************/
 	if (!(fs = fopen(outfn, "wb"))) {
-		snprintf(g->Message, sizeof(g->Message), MSG(OPEN_MODE_ERROR),
-			"w", (int)errno, outfn);
-		strcat(strcat(g->Message, ": "), strerror(errno));
+		snprintf(g->Message, sizeof(g->Message), MSG(OPEN_MODE_ERROR)": %s",
+			"w", (int)errno, outfn, strerror(errno));
 		CloseMemMap(mm.memory, len);
 		return NULL;
 	} // endif fs
diff --git a/storage/connect/myconn.cpp b/storage/connect/myconn.cpp
index 579ca07616e..ba493f5bbb9 100644
--- a/storage/connect/myconn.cpp
+++ b/storage/connect/myconn.cpp
@@ -405,18 +405,20 @@ PQRYRES SrcColumns(PGLOBAL g, const char *host, const char *db,
     port = mysqld_port;
 
 	if (!strnicmp(srcdef, "select ", 7) || strstr(srcdef, "%s")) {
-		query = (char *)PlugSubAlloc(g, NULL, strlen(srcdef) + 10);
+		size_t query_sz = strlen(srcdef) + 10;
+		query = (char *)PlugSubAlloc(g, NULL, query_sz);
 
 		if ((p= strstr(srcdef, "%s")))
 		{
 			/* Replace %s with 1=1 */
-			sprintf(query, "%.*s1=1%s", (int) (p - srcdef), srcdef, p + 2); // dummy where clause
+			snprintf(query, query_sz, "%.*s1=1%s",
+			         (int) (p - srcdef), srcdef, p + 2); // dummy where clause
 		}
-		else 
-		  strcpy(query, srcdef);
+		else
+			safe_strcpy(query, query_sz, srcdef);
 
 		if (!strnicmp(srcdef, "select ", 7))
-		  strcat(query, " LIMIT 0");
+			safe_strcat(query, query_sz, " LIMIT 0");
 
 	} else
     query = (char *)srcdef;
diff --git a/storage/mroonga/vendor/groonga/lib/alloc.c b/storage/mroonga/vendor/groonga/lib/alloc.c
index 94e31901cec..adb35e04c45 100644
--- a/storage/mroonga/vendor/groonga/lib/alloc.c
+++ b/storage/mroonga/vendor/groonga/lib/alloc.c
@@ -828,7 +828,7 @@ grn_free_default(grn_ctx *ctx, void *ptr,
     if (ptr) {
       GRN_ADD_ALLOC_COUNT(-1);
     } else {
-      GRN_LOG(ctx, GRN_LOG_ALERT, "free fail (%s:%d) <%d>",
+      GRN_LOG(ctx, GRN_LOG_ALERT, "free fail (nullptr) (%s:%d) <%d>",
               file, line, alloc_count);
     }
   }
diff --git a/storage/spider/mysql-test/spider/bugfix/r/mdev_26541.result b/storage/spider/mysql-test/spider/bugfix/r/mdev_26541.result
new file mode 100644
index 00000000000..b2edaff6918
--- /dev/null
+++ b/storage/spider/mysql-test/spider/bugfix/r/mdev_26541.result
@@ -0,0 +1,20 @@
+#
+# MDEV-26541 Undefined symbol: _ZTI12ha_partition when attempting to use ha_spider.so in UBSAN builds
+#
+INSTALL PLUGIN spider SONAME 'ha_spider.so';
+DROP FUNCTION spider_flush_table_mon_cache;
+DROP FUNCTION spider_copy_tables;
+DROP FUNCTION spider_ping_table;
+DROP FUNCTION spider_bg_direct_sql;
+DROP FUNCTION spider_direct_sql;
+UNINSTALL PLUGIN spider_alloc_mem;
+UNINSTALL PLUGIN spider;
+DROP TABLE IF EXISTS mysql.spider_xa;
+DROP TABLE IF EXISTS mysql.spider_xa_member;
+DROP TABLE IF EXISTS mysql.spider_xa_failed_log;
+DROP TABLE IF EXISTS mysql.spider_tables;
+DROP TABLE IF EXISTS mysql.spider_link_mon_servers;
+DROP TABLE IF EXISTS mysql.spider_link_failed_log;
+DROP TABLE IF EXISTS mysql.spider_table_position_for_recovery;
+DROP TABLE IF EXISTS mysql.spider_table_sts;
+DROP TABLE IF EXISTS mysql.spider_table_crd;
diff --git a/storage/spider/mysql-test/spider/bugfix/r/mdev_30370.result b/storage/spider/mysql-test/spider/bugfix/r/mdev_30370.result
new file mode 100644
index 00000000000..df0f6949280
--- /dev/null
+++ b/storage/spider/mysql-test/spider/bugfix/r/mdev_30370.result
@@ -0,0 +1,3 @@
+#
+# MDEV-30370 mariadbd hangs when running with --wsrep-recover and --plugin-load-add=ha_spider.so
+#
diff --git a/storage/spider/mysql-test/spider/bugfix/t/mdev_26541.test b/storage/spider/mysql-test/spider/bugfix/t/mdev_26541.test
new file mode 100644
index 00000000000..ffd99390748
--- /dev/null
+++ b/storage/spider/mysql-test/spider/bugfix/t/mdev_26541.test
@@ -0,0 +1,40 @@
+--echo #
+--echo # MDEV-26541 Undefined symbol: _ZTI12ha_partition when attempting to use ha_spider.so in UBSAN builds
+--echo #
+
+if (`select not(count(*)) from information_schema.system_variables where variable_name='have_sanitizer' and global_value="UBSAN"`)
+{
+--skip test needs to be run with UBSAN
+}
+
+# init spider
+
+INSTALL PLUGIN spider SONAME 'ha_spider.so';
+
+let $PLUGIN_NAME= spider_flush_table_mon_cache;
+let $PLUGIN_EXIST=
+  `SELECT COUNT(*) FROM mysql.func WHERE name = '$PLUGIN_NAME'`;
+while (!$PLUGIN_EXIST)
+{
+  let $PLUGIN_EXIST=
+    `SELECT COUNT(*) FROM mysql.func WHERE name = '$PLUGIN_NAME'`;
+}
+
+# deinit spider
+
+DROP FUNCTION spider_flush_table_mon_cache;
+DROP FUNCTION spider_copy_tables;
+DROP FUNCTION spider_ping_table;
+DROP FUNCTION spider_bg_direct_sql;
+DROP FUNCTION spider_direct_sql;
+UNINSTALL PLUGIN spider_alloc_mem;
+UNINSTALL PLUGIN spider;
+DROP TABLE IF EXISTS mysql.spider_xa;
+DROP TABLE IF EXISTS mysql.spider_xa_member;
+DROP TABLE IF EXISTS mysql.spider_xa_failed_log;
+DROP TABLE IF EXISTS mysql.spider_tables;
+DROP TABLE IF EXISTS mysql.spider_link_mon_servers;
+DROP TABLE IF EXISTS mysql.spider_link_failed_log;
+DROP TABLE IF EXISTS mysql.spider_table_position_for_recovery;
+DROP TABLE IF EXISTS mysql.spider_table_sts;
+DROP TABLE IF EXISTS mysql.spider_table_crd;
diff --git a/storage/spider/mysql-test/spider/bugfix/t/mdev_30370.test b/storage/spider/mysql-test/spider/bugfix/t/mdev_30370.test
new file mode 100644
index 00000000000..788ea2323f7
--- /dev/null
+++ b/storage/spider/mysql-test/spider/bugfix/t/mdev_30370.test
@@ -0,0 +1,5 @@
+--echo #
+--echo # MDEV-30370 mariadbd hangs when running with --wsrep-recover and --plugin-load-add=ha_spider.so
+--echo #
+
+--exec $MYSQLD_BOOTSTRAP_CMD --wsrep-recover --plugin-load-add=ha_spider.so
diff --git a/storage/spider/spd_conn.cc b/storage/spider/spd_conn.cc
index d98f688fd39..ef10a56d583 100644
--- a/storage/spider/spd_conn.cc
+++ b/storage/spider/spd_conn.cc
@@ -637,18 +637,25 @@ SPIDER_CONN *spider_create_conn(
     conn->tgt_host = tmp_host;
     memcpy(conn->tgt_host, share->tgt_hosts[link_idx],
       share->tgt_hosts_lengths[link_idx]);
+
     conn->tgt_username_length = share->tgt_usernames_lengths[link_idx];
     conn->tgt_username = tmp_username;
-    memcpy(conn->tgt_username, share->tgt_usernames[link_idx],
-      share->tgt_usernames_lengths[link_idx]);
+    if (conn->tgt_username_length)
+      memcpy(conn->tgt_username, share->tgt_usernames[link_idx],
+             share->tgt_usernames_lengths[link_idx]);
+
     conn->tgt_password_length = share->tgt_passwords_lengths[link_idx];
     conn->tgt_password = tmp_password;
-    memcpy(conn->tgt_password, share->tgt_passwords[link_idx],
-      share->tgt_passwords_lengths[link_idx]);
+    if (conn->tgt_password_length)
+      memcpy(conn->tgt_password, share->tgt_passwords[link_idx],
+             share->tgt_passwords_lengths[link_idx]);
+
     conn->tgt_socket_length = share->tgt_sockets_lengths[link_idx];
     conn->tgt_socket = tmp_socket;
-    memcpy(conn->tgt_socket, share->tgt_sockets[link_idx],
-      share->tgt_sockets_lengths[link_idx]);
+    if (conn->tgt_socket_length)
+      memcpy(conn->tgt_socket, share->tgt_sockets[link_idx],
+             share->tgt_sockets_lengths[link_idx]);
+
     conn->tgt_wrapper_length = share->tgt_wrappers_lengths[link_idx];
     conn->tgt_wrapper = tmp_wrapper;
     memcpy(conn->tgt_wrapper, share->tgt_wrappers[link_idx],
diff --git a/storage/spider/spd_table.cc b/storage/spider/spd_table.cc
index 7b07e84cd1f..349e34f6632 100644
--- a/storage/spider/spd_table.cc
+++ b/storage/spider/spd_table.cc
@@ -10102,6 +10102,7 @@ void spider_free_sts_threads(
 ) {
   bool thread_killed;
   DBUG_ENTER("spider_free_sts_threads");
+  spider_thread->init_command = FALSE;
   pthread_mutex_lock(&spider_thread->mutex);
   thread_killed = spider_thread->killed;
   spider_thread->killed = TRUE;
@@ -10258,12 +10259,13 @@ void *spider_table_bg_sts_action(
     tmp_disable_binlog(thd);
     thd->security_ctx->skip_grants();
     thd->client_capabilities |= CLIENT_MULTI_RESULTS;
-    if (!(*spd_mysqld_server_started) && !thd->killed)
+    if (!(*spd_mysqld_server_started) && !thd->killed && !thread->killed)
     {
       pthread_mutex_lock(spd_LOCK_server_started);
       thd->mysys_var->current_cond = spd_COND_server_started;
       thd->mysys_var->current_mutex = spd_LOCK_server_started;
-      if (!(*spd_mysqld_server_started) && !thd->killed)
+      if (!(*spd_mysqld_server_started) && !thd->killed && !thread->killed &&
+        thread->init_command)
       {
         do
         {
@@ -10273,14 +10275,16 @@ void *spider_table_bg_sts_action(
             spd_LOCK_server_started, &abstime);
         } while (
           (error_num == ETIMEDOUT || error_num == ETIME) &&
-          !(*spd_mysqld_server_started) && !thd->killed && !thread->killed
+          !(*spd_mysqld_server_started) && !thd->killed && !thread->killed &&
+          thread->init_command
         );
       }
       pthread_mutex_unlock(spd_LOCK_server_started);
       thd->mysys_var->current_cond = &thread->cond;
       thd->mysys_var->current_mutex = &thread->mutex;
     }
-    while (spider_init_queries[i].length && !thd->killed && !thread->killed)
+    while (spider_init_queries[i].length && !thd->killed && !thread->killed &&
+      thread->init_command)
     {
       dispatch_command(COM_QUERY, thd, spider_init_queries[i].str,
         (uint) spider_init_queries[i].length, FALSE, FALSE);
diff --git a/storage/spider/spd_trx.cc b/storage/spider/spd_trx.cc
index 316fe23f40e..b00a7262230 100644
--- a/storage/spider/spd_trx.cc
+++ b/storage/spider/spd_trx.cc
@@ -627,103 +627,136 @@ int spider_create_trx_alter_table(
   alter_table->tmp_tgt_dsns_lengths = tmp_tgt_dsns_lengths;
   alter_table->tmp_static_link_ids_lengths = tmp_static_link_ids_lengths;
 
+  size_t len;
   for(roop_count = 0; roop_count < (int) share->all_link_count; roop_count++)
   {
-    tmp_server_names[roop_count] = tmp_server_names_char;
-    memcpy(tmp_server_names_char,
-      share_alter->tmp_server_names[roop_count],
-      sizeof(char) * share_alter->tmp_server_names_lengths[roop_count]);
-    tmp_server_names_char +=
-      share_alter->tmp_server_names_lengths[roop_count] + 1;
-
-    tmp_tgt_table_names[roop_count] = tmp_tgt_table_names_char;
-    memcpy(tmp_tgt_table_names_char,
-      share_alter->tmp_tgt_table_names[roop_count],
-      sizeof(char) * share_alter->tmp_tgt_table_names_lengths[roop_count]);
-    tmp_tgt_table_names_char +=
-      share_alter->tmp_tgt_table_names_lengths[roop_count] + 1;
-
-    tmp_tgt_dbs[roop_count] = tmp_tgt_dbs_char;
-    memcpy(tmp_tgt_dbs_char, share_alter->tmp_tgt_dbs[roop_count],
-      sizeof(char) * share_alter->tmp_tgt_dbs_lengths[roop_count]);
-    tmp_tgt_dbs_char +=
-      share_alter->tmp_tgt_dbs_lengths[roop_count] + 1;
-
-    tmp_tgt_hosts[roop_count] = tmp_tgt_hosts_char;
-    memcpy(tmp_tgt_hosts_char, share_alter->tmp_tgt_hosts[roop_count],
-      sizeof(char) * share_alter->tmp_tgt_hosts_lengths[roop_count]);
-    tmp_tgt_hosts_char +=
-      share_alter->tmp_tgt_hosts_lengths[roop_count] + 1;
-
-    tmp_tgt_usernames[roop_count] = tmp_tgt_usernames_char;
-    memcpy(tmp_tgt_usernames_char, share_alter->tmp_tgt_usernames[roop_count],
-      sizeof(char) * share_alter->tmp_tgt_usernames_lengths[roop_count]);
-    tmp_tgt_usernames_char +=
-      share_alter->tmp_tgt_usernames_lengths[roop_count] + 1;
-
-    tmp_tgt_passwords[roop_count] = tmp_tgt_passwords_char;
-    memcpy(tmp_tgt_passwords_char, share_alter->tmp_tgt_passwords[roop_count],
-      sizeof(char) * share_alter->tmp_tgt_passwords_lengths[roop_count]);
-    tmp_tgt_passwords_char +=
-      share_alter->tmp_tgt_passwords_lengths[roop_count] + 1;
-
-    tmp_tgt_sockets[roop_count] = tmp_tgt_sockets_char;
-    memcpy(tmp_tgt_sockets_char, share_alter->tmp_tgt_sockets[roop_count],
-      sizeof(char) * share_alter->tmp_tgt_sockets_lengths[roop_count]);
-    tmp_tgt_sockets_char +=
-      share_alter->tmp_tgt_sockets_lengths[roop_count] + 1;
-
-    tmp_tgt_wrappers[roop_count] = tmp_tgt_wrappers_char;
-    memcpy(tmp_tgt_wrappers_char, share_alter->tmp_tgt_wrappers[roop_count],
-      sizeof(char) * share_alter->tmp_tgt_wrappers_lengths[roop_count]);
-    tmp_tgt_wrappers_char +=
-      share_alter->tmp_tgt_wrappers_lengths[roop_count] + 1;
-
-    tmp_tgt_ssl_cas[roop_count] = tmp_tgt_ssl_cas_char;
-    memcpy(tmp_tgt_ssl_cas_char, share_alter->tmp_tgt_ssl_cas[roop_count],
-      sizeof(char) * share_alter->tmp_tgt_ssl_cas_lengths[roop_count]);
-    tmp_tgt_ssl_cas_char +=
-      share_alter->tmp_tgt_ssl_cas_lengths[roop_count] + 1;
-
-    tmp_tgt_ssl_capaths[roop_count] = tmp_tgt_ssl_capaths_char;
-    memcpy(tmp_tgt_ssl_capaths_char,
-      share_alter->tmp_tgt_ssl_capaths[roop_count],
-      sizeof(char) * share_alter->tmp_tgt_ssl_capaths_lengths[roop_count]);
-    tmp_tgt_ssl_capaths_char +=
-      share_alter->tmp_tgt_ssl_capaths_lengths[roop_count] + 1;
-
-    tmp_tgt_ssl_certs[roop_count] = tmp_tgt_ssl_certs_char;
-    memcpy(tmp_tgt_ssl_certs_char, share_alter->tmp_tgt_ssl_certs[roop_count],
-      sizeof(char) * share_alter->tmp_tgt_ssl_certs_lengths[roop_count]);
-    tmp_tgt_ssl_certs_char +=
-      share_alter->tmp_tgt_ssl_certs_lengths[roop_count] + 1;
-
-    tmp_tgt_ssl_ciphers[roop_count] = tmp_tgt_ssl_ciphers_char;
-    memcpy(tmp_tgt_ssl_ciphers_char,
-      share_alter->tmp_tgt_ssl_ciphers[roop_count],
-      sizeof(char) * share_alter->tmp_tgt_ssl_ciphers_lengths[roop_count]);
-    tmp_tgt_ssl_ciphers_char +=
-      share_alter->tmp_tgt_ssl_ciphers_lengths[roop_count] + 1;
-
-    tmp_tgt_ssl_keys[roop_count] = tmp_tgt_ssl_keys_char;
-    memcpy(tmp_tgt_ssl_keys_char, share_alter->tmp_tgt_ssl_keys[roop_count],
-      sizeof(char) * share_alter->tmp_tgt_ssl_keys_lengths[roop_count]);
-    tmp_tgt_ssl_keys_char +=
-      share_alter->tmp_tgt_ssl_keys_lengths[roop_count] + 1;
-
-    tmp_tgt_default_files[roop_count] = tmp_tgt_default_files_char;
-    memcpy(tmp_tgt_default_files_char,
-      share_alter->tmp_tgt_default_files[roop_count],
-      sizeof(char) * share_alter->tmp_tgt_default_files_lengths[roop_count]);
-    tmp_tgt_default_files_char +=
-      share_alter->tmp_tgt_default_files_lengths[roop_count] + 1;
-
-    tmp_tgt_default_groups[roop_count] = tmp_tgt_default_groups_char;
-    memcpy(tmp_tgt_default_groups_char,
-      share_alter->tmp_tgt_default_groups[roop_count],
-      sizeof(char) * share_alter->tmp_tgt_default_groups_lengths[roop_count]);
-    tmp_tgt_default_groups_char +=
-      share_alter->tmp_tgt_default_groups_lengths[roop_count] + 1;
+    if ((len=
+             sizeof(char) * share_alter->tmp_server_names_lengths[roop_count]))
+    {
+      tmp_server_names[roop_count]= tmp_server_names_char;
+      memcpy(tmp_server_names_char, share_alter->tmp_server_names[roop_count],
+             len);
+      tmp_server_names_char+= len + 1;
+    }
+
+    if ((len= sizeof(char) *
+              share_alter->tmp_tgt_table_names_lengths[roop_count]))
+    {
+      tmp_tgt_table_names[roop_count]= tmp_tgt_table_names_char;
+      memcpy(tmp_tgt_table_names_char,
+             share_alter->tmp_tgt_table_names[roop_count], len);
+      tmp_tgt_table_names_char+= len + 1;
+    }
+
+    if ((len= sizeof(char) * share_alter->tmp_tgt_dbs_lengths[roop_count]))
+    {
+      tmp_tgt_dbs[roop_count]= tmp_tgt_dbs_char;
+      memcpy(tmp_tgt_dbs_char, share_alter->tmp_tgt_dbs[roop_count], len);
+      tmp_tgt_dbs_char+= len + 1;
+    }
+
+    if ((len= sizeof(char) * share_alter->tmp_tgt_hosts_lengths[roop_count]))
+    {
+      tmp_tgt_hosts[roop_count]= tmp_tgt_hosts_char;
+      memcpy(tmp_tgt_hosts_char, share_alter->tmp_tgt_hosts[roop_count], len);
+      tmp_tgt_hosts_char+= len + 1;
+    }
+
+    if ((len= sizeof(char) *
+              share_alter->tmp_tgt_usernames_lengths[roop_count]))
+    {
+      tmp_tgt_usernames[roop_count]= tmp_tgt_usernames_char;
+      memcpy(tmp_tgt_usernames_char,
+             share_alter->tmp_tgt_usernames[roop_count], len);
+      tmp_tgt_usernames_char+= len + 1;
+    }
+
+    if ((len= sizeof(char) *
+              share_alter->tmp_tgt_passwords_lengths[roop_count]))
+    {
+      tmp_tgt_passwords[roop_count]= tmp_tgt_passwords_char;
+      memcpy(tmp_tgt_passwords_char,
+             share_alter->tmp_tgt_passwords[roop_count], len);
+      tmp_tgt_passwords_char+= len + 1;
+    }
+
+    if ((len= sizeof(char) * share_alter->tmp_tgt_sockets_lengths[roop_count]))
+    {
+      tmp_tgt_sockets[roop_count]= tmp_tgt_sockets_char;
+      memcpy(tmp_tgt_sockets_char, share_alter->tmp_tgt_sockets[roop_count],
+             len);
+      tmp_tgt_sockets_char+= len + 1;
+    }
+
+    if ((len=
+             sizeof(char) * share_alter->tmp_tgt_wrappers_lengths[roop_count]))
+    {
+      tmp_tgt_wrappers[roop_count]= tmp_tgt_wrappers_char;
+      memcpy(tmp_tgt_wrappers_char, share_alter->tmp_tgt_wrappers[roop_count],
+             len);
+      tmp_tgt_wrappers_char+= len + 1;
+    }
+
+    if ((len= sizeof(char) * share_alter->tmp_tgt_ssl_cas_lengths[roop_count]))
+    {
+      tmp_tgt_ssl_cas[roop_count]= tmp_tgt_ssl_cas_char;
+      memcpy(tmp_tgt_ssl_cas_char, share_alter->tmp_tgt_ssl_cas[roop_count],
+             len);
+      tmp_tgt_ssl_cas_char+= len + 1;
+    }
+
+    if ((len= sizeof(char) *
+              share_alter->tmp_tgt_ssl_capaths_lengths[roop_count]))
+    {
+      tmp_tgt_ssl_capaths[roop_count]= tmp_tgt_ssl_capaths_char;
+      memcpy(tmp_tgt_ssl_capaths_char,
+             share_alter->tmp_tgt_ssl_capaths[roop_count], len);
+      tmp_tgt_ssl_capaths_char+= len + 1;
+    }
+
+    if ((len= sizeof(char) *
+              share_alter->tmp_tgt_ssl_certs_lengths[roop_count]))
+    {
+      tmp_tgt_ssl_certs[roop_count]= tmp_tgt_ssl_certs_char;
+      memcpy(tmp_tgt_ssl_certs_char,
+             share_alter->tmp_tgt_ssl_certs[roop_count], len);
+      tmp_tgt_ssl_certs_char+= len + 1;
+    }
+
+    if ((len= sizeof(char) *
+              share_alter->tmp_tgt_ssl_ciphers_lengths[roop_count]))
+    {
+      tmp_tgt_ssl_ciphers[roop_count]= tmp_tgt_ssl_ciphers_char;
+      memcpy(tmp_tgt_ssl_ciphers_char,
+             share_alter->tmp_tgt_ssl_ciphers[roop_count], len);
+      tmp_tgt_ssl_ciphers_char+= len + 1;
+    }
+
+    if ((len= sizeof(char) * share_alter->tmp_tgt_ssl_keys_lengths[roop_count]))
+    {
+      tmp_tgt_ssl_keys[roop_count]= tmp_tgt_ssl_keys_char;
+      memcpy(tmp_tgt_ssl_keys_char, share_alter->tmp_tgt_ssl_keys[roop_count],
+             len);
+      tmp_tgt_ssl_keys_char+= len + 1;
+    }
+
+    if ((len= sizeof(char) *
+              share_alter->tmp_tgt_default_files_lengths[roop_count]))
+    {
+      tmp_tgt_default_files[roop_count]= tmp_tgt_default_files_char;
+      memcpy(tmp_tgt_default_files_char,
+             share_alter->tmp_tgt_default_files[roop_count], len);
+      tmp_tgt_default_files_char+= len + 1;
+    }
+
+    if ((len= sizeof(char) *
+              share_alter->tmp_tgt_default_groups_lengths[roop_count]))
+    {
+      tmp_tgt_default_groups[roop_count]= tmp_tgt_default_groups_char;
+      memcpy(tmp_tgt_default_groups_char,
+             share_alter->tmp_tgt_default_groups[roop_count], len);
+      tmp_tgt_default_groups_char+= len + 1;
+    }
 
     tmp_tgt_dsns[roop_count] = tmp_tgt_dsns_char;
     memcpy(tmp_tgt_dsns_char, share_alter->tmp_tgt_dsns[roop_count],
@@ -731,14 +764,13 @@ int spider_create_trx_alter_table(
     tmp_tgt_dsns_char +=
       share_alter->tmp_tgt_dsns_lengths[roop_count] + 1;
 
-    if (share_alter->tmp_static_link_ids[roop_count])
+    if ((len= sizeof(char) *
+              share_alter->tmp_static_link_ids_lengths[roop_count]))
     {
       tmp_static_link_ids[roop_count] = tmp_static_link_ids_char;
       memcpy(tmp_static_link_ids_char,
-        share_alter->tmp_static_link_ids[roop_count],
-        sizeof(char) * share_alter->tmp_static_link_ids_lengths[roop_count]);
-      tmp_static_link_ids_char +=
-        share_alter->tmp_static_link_ids_lengths[roop_count] + 1;
+             share_alter->tmp_static_link_ids[roop_count], len);
+      tmp_static_link_ids_char += len + 1;
     }
   }