Merge lp:~akopytov/percona-server/bug1132350 into lp:percona-server/5.5

[Alexey Kopytov]

[Alexey Kopytov (akopytov)]

http://jenkins.percona.com/view/PS%205.5/job/percona-server-5.5-param/686/

[Sergei Glushchenko (sergei.glushchenko)]

Approve

review: Approve (g2)

=== modified file 'Percona-Server/strings/ctype-simple.c'
--- Percona-Server/strings/ctype-simple.c	2011-06-30 15:46:53 +0000
+++ Percona-Server/strings/ctype-simple.c	2013-02-24 15:11:22 +0000
@@ -76,23 +76,21 @@
                           const uchar *src, size_t srclen)
 {
   uchar *map= cs->sort_order;
-  size_t dstlen= len;
-  set_if_smaller(len, srclen);
-  if (dest != src)
+  const uchar *end;
+
+  if (likely(len <= srclen))
   {
-    const uchar *end;
-    for ( end=src+len; src < end ;  )
+    for (end = src + len; src < end ;  )
       *dest++= map[*src++];
   }
   else
   {
-    const uchar *end;
-    for ( end=dest+len; dest < end ; dest++)
-      *dest= (char) map[(uchar) *dest];
+    for (end = src + srclen; src < end ;  )
+      *dest++= map[*src++];
+    memset(dest, ' ', len - srclen);
   }
-  if (dstlen > len)
-    bfill(dest, dstlen - len, ' ');
-  return dstlen;
+
+  return len;
 }