------------------------------------------------------------
revno: 8779
committer: Laurynas Biveinis <laurynas.biveinis@percona.com>
branch nick: mysql-5.7-percona-patches
timestamp: Tue 2014-11-25 11:10:13 +0200
message:
  Fix http://bugs.mysql.com/bug.php?id=68476 (Suboptimal code in
  my_strnxfrm_simple()) by removing the redundant if from the function.
diff:
=== modified file 'strings/ctype-simple.c'
--- strings/ctype-simple.c	2014-06-24 13:49:46 +0000
+++ strings/ctype-simple.c	2014-11-25 09:10:13 +0000
@@ -78,21 +78,12 @@
 {
   const uchar *map= cs->sort_order;
   uchar *d0= dst;
+  const uchar *end;
   size_t frmlen;
   if ((frmlen= MY_MIN(dstlen, nweights)) > srclen)
     frmlen= srclen;
-  if (dst != src)
-  {
-    const uchar *end;
-    for (end= src + frmlen; src < end;)
-      *dst++= map[*src++];
-  }
-  else
-  {
-    const uchar *end;
-    for (end= dst + frmlen; dst < end; dst++)
-      *dst= map[(uchar) *dst];
-  }
+  for (end= src + frmlen; src < end;)
+    *dst++= map[*src++];
   return my_strxfrm_pad_desc_and_reverse(cs, d0, dst, d0 + dstlen,
                                          (uint)(nweights - frmlen), flags, 0);
 }