- Fix MDEV-7489 (in add_field)

modified:
  storage/connect/ha_connect.cc

- Fix MDEV-7494 (adding Insert_quoted in the STRING class)
modified:
  storage/connect/tabmysql.cpp
  storage/connect/xobject.cpp
  storage/connect/xobject.h

- Fix MDEV-7498 in value.cpp (AllocateValue)
modified:
  storage/connect/value.cpp

- Handle backslash in Json serialize + uchar + typo.
modified:
  storage/connect/json.cpp
  storage/connect/tabjson.cpp

1 files changed, 25 insertions, 0 deletions

diff --git a/storage/connect/xobject.cpp b/storage/connect/xobject.cpp
index 4ddd4f5b30f..b9a0236e7c8 100644
--- a/storage/connect/xobject.cpp
+++ b/storage/connect/xobject.cpp
@@ -347,6 +347,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.                     */
 /***********************************************************************/