manual merge

mysql-test/r/ctype_latin1_de.result:
  Auto merged
mysql-test/r/ctype_tis620.result:
  Auto merged
mysql-test/r/ctype_ucs.result:
  Auto merged
mysql-test/r/ctype_ujis.result:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/t/ctype_ucs.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/filesort.cc:
  Auto merged
strings/ctype-big5.c:
  Auto merged
strings/ctype-bin.c:
  Auto merged
strings/ctype-czech.c:
  Auto merged
strings/ctype-gbk.c:
  Auto merged
strings/ctype-latin1.c:
  Auto merged
strings/ctype-mb.c:
  Auto merged
strings/ctype-simple.c:
  Auto merged
strings/ctype-sjis.c:
  Auto merged
strings/ctype-tis620.c:
  Auto merged
strings/ctype-uca.c:
  Auto merged
strings/ctype-ucs2.c:
  Auto merged
strings/ctype-utf8.c:
  Auto merged
strings/ctype-win1250ch.c:
  Auto merged

1 files changed, 5 insertions, 3 deletions

diff --git a/strings/ctype-czech.c b/strings/ctype-czech.c
index 76981200a4d..2834dbb28ff 100644
--- a/strings/ctype-czech.c
+++ b/strings/ctype-czech.c
@@ -298,16 +298,18 @@ static int my_strnxfrm_czech(CHARSET_INFO *cs __attribute__((unused)),
   int value;
   const uchar * p, * store;
   int pass = 0;
-  int totlen = 0;
+  uint totlen = 0;
   p = src;	store = src;
 
   do
   {
     NEXT_CMP_VALUE(src, p, store, pass, value, (int)srclen);
-    ADD_TO_RESULT(dest, (int)len, totlen, value);
+    ADD_TO_RESULT(dest, len, totlen, value);
   }
   while (value);
-  return totlen;
+  if (len > totlen)
+    bfill(dest + totlen, len - totlen, ' ');
+  return len;
 }
 
 #undef IS_END