merge 5.5 => 5.6

Tor Didriksen · Tor Didriksen · commit 752f93f69369 · 2014-05-16T11:00:39.000+02:00
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc
@@ -1827,6 +1827,42 @@ String *Item_func_substr_index::val_str(String *str)
   return (&tmp_value);
 }
 
+
+/**
+  A helper function for trim(leading ...) for multibyte charsets.
+  @param res        Copy of 'res' in calling functions.
+  @param ptr        Where to start trimming.
+  @param end        End of string to be trimmed.
+  @param remove_str The string to be removed from [ptr .. end)
+  @return           Pointer to left-trimmed string.
+ */
+static inline
+char *trim_left_mb(String *res, char *ptr, char *end, String *remove_str)
+{
+  const char * const r_ptr= remove_str->ptr();
+  const uint remove_length= remove_str->length();
+
+  while (ptr + remove_length <= end)
+  {
+    uint num_bytes= 0;
+    while (num_bytes < remove_length)
+    {
+      uint len;
+      if ((len= my_ismbchar(res->charset(), ptr + num_bytes, end)))
+        num_bytes+= len;
+      else
+        ++num_bytes;
+    }
+    if (num_bytes != remove_length)
+      break;
+    if (memcmp(ptr, r_ptr, remove_length))
+      break;
+    ptr+= remove_length;
+  }
+  return ptr;
+}
+
+
 /*
 ** The trim functions are extension to ANSI SQL because they trim substrings
 ** They ltrim() and rtrim() functions are optimized for 1 byte strings
@@ -1861,19 +1897,28 @@ String *Item_func_ltrim::val_str(String *str)
 
   ptr= (char*) res->ptr();
   end= ptr+res->length();
-  if (remove_length == 1)
+#ifdef USE_MB
+  if (use_mb(res->charset()))
   {
-    char chr=(*remove_str)[0];
-    while (ptr != end && *ptr == chr)
-      ptr++;
+    ptr= trim_left_mb(res, ptr, end, remove_str);
   }
   else
+#endif /* USE_MB */
   {
-    const char *r_ptr=remove_str->ptr();
-    end-=remove_length;
-    while (ptr <= end && !memcmp(ptr, r_ptr, remove_length))
-      ptr+=remove_length;
-    end+=remove_length;
+    if (remove_length == 1)
+    {
+      char chr=(*remove_str)[0];
+      while (ptr != end && *ptr == chr)
+        ptr++;
+    }
+    else
+    {
+      const char *r_ptr=remove_str->ptr();
+      end-=remove_length;
+      while (ptr <= end && !memcmp(ptr, r_ptr, remove_length))
+        ptr+=remove_length;
+      end+=remove_length;
+    }
   }
   if (ptr == res->ptr())
     return res;
@@ -1967,11 +2012,8 @@ String *Item_func_trim::val_str(String *str)
 {
   DBUG_ASSERT(fixed == 1);
   char buff[MAX_FIELD_WIDTH], *ptr, *end;
-  const char *r_ptr;
   String tmp(buff, sizeof(buff), system_charset_info);
   String *res, *remove_str;
-  uint remove_length;
-  LINT_INIT(remove_length);
 
   res= args[0]->val_str(str);
   if ((null_value=args[0]->null_value))
@@ -1984,33 +2026,19 @@ String *Item_func_trim::val_str(String *str)
       return 0;
   }
 
-  if ((remove_length= remove_str->length()) == 0 ||
+  const uint remove_length= remove_str->length();
+  if (remove_length == 0 ||
       remove_length > res->length())
     return res;
 
   ptr= (char*) res->ptr();
   end= ptr+res->length();
-  r_ptr= remove_str->ptr();
+  const char * const r_ptr= remove_str->ptr();
 #ifdef USE_MB
   if (use_mb(res->charset()))
   {
-    while (ptr + remove_length <= end)
-    {
-      uint num_bytes= 0;
-      while (num_bytes < remove_length)
-      {
-        uint len;
-        if ((len= my_ismbchar(res->charset(), ptr + num_bytes, end)))
-          num_bytes+= len;
-        else
-          ++num_bytes;
-      }
-      if (num_bytes != remove_length)
-        break;
-      if (memcmp(ptr, r_ptr, remove_length))
-        break;
-      ptr+= remove_length;
-    }
+    ptr= trim_left_mb(res, ptr, end, remove_str);
+
     char *p=ptr;
     register uint32 l;
  loop:
