Merge tag 'mariadb-10.0.20' into 10.0-FusionIO10.0-FusionIO

Conflicts:
	storage/innobase/os/os0file.cc
	storage/xtradb/os/os0file.cc
	storage/xtradb/srv/srv0start.cc

1 files changed, 54 insertions, 0 deletions

diff --git a/storage/connect/xobject.cpp b/storage/connect/xobject.cpp
index 4ddd4f5b30f..a6faebf3c2b 100644
--- a/storage/connect/xobject.cpp
+++ b/storage/connect/xobject.cpp
@@ -11,6 +11,7 @@
 /*  Include mariaDB header file.                                       */
 /***********************************************************************/
 #include "my_global.h"
+#include "m_string.h"
 
 /***********************************************************************/
 /*  Include required application header files                          */
@@ -290,6 +291,34 @@ bool STRING::Set(char *s, uint n)
 } // end of Set
 
 /***********************************************************************/
+/*  Append a char* to a STRING.                                          */
+/***********************************************************************/
+bool STRING::Append(const char *s, uint ln)
+{
+  if (!s)
+    return false;
+
+  uint len = Length + ln + 1;
+
+  if (len > Size) {
+    char *p = Realloc(len);
+    
+    if (!p)
+      return true;
+    else if (p != Strp) {
+      strcpy(p, Strp);
+      Strp = p;
+      } // endif p
+
+    } // endif n
+
+  strncpy(Strp + Length, s, ln);
+  Length = len - 1;
+  Strp[Length] = 0;
+  return false;
+} // end of Append
+
+/***********************************************************************/
 /*  Append a PSZ to a STRING.                                          */
 /***********************************************************************/
 bool STRING::Append(PSZ s)
@@ -347,6 +376,31 @@ bool STRING::Append(char c)
 } // end of Append
 
 /***********************************************************************/
+/*  Append a quoted PSZ to a STRING.                                   */
+/***********************************************************************/
+bool STRING::Append_quoted(PSZ s)
+{
+  bool b = Append('\'');
+
+  if (s) for (char *p = s; !b && *p; p++)
+    switch (*p) {
+      case '\'':
+      case '\\':
+      case '\t':
+      case '\n':
+      case '\r':
+      case '\b':
+      case '\f': b |= Append('\\');
+        // passthru
+      default:
+        b |= Append(*p);
+        break;
+      } // endswitch *p
+
+  return (b |= Append('\''));
+} // end of Append_quoted
+
+/***********************************************************************/
 /*  Resize to given length but only when last suballocated.            */
 /*  New size should be greater than string length.                     */
 /***********************************************************************/