Merge with 4.1

(Includes merge of arena code in 4.1 and 5.0)

1 files changed, 11 insertions, 0 deletions

diff --git a/sql/table.cc b/sql/table.cc
index 1764df75a7e..5d0c60718d3 100644
--- a/sql/table.cc
+++ b/sql/table.cc
@@ -1111,6 +1111,17 @@ void append_unescaped(String *res, const char *pos, uint length)
 
   for (; pos != end ; pos++)
   {
+#if defined(USE_MB) && MYSQL_VERSION_ID < 40100
+    uint mblen;
+    if (use_mb(default_charset_info) &&
+        (mblen= my_ismbchar(default_charset_info, pos, end)))
+    {
+      res->append(pos, mblen);
+      pos+= mblen;
+      continue;
+    }
+#endif
+
     switch (*pos) {
     case 0:				/* Must be escaped for 'mysql' */
       res->append('\\');