diff options
Diffstat (limited to 'sql/sql_string.cc')
| -rw-r--r-- | sql/sql_string.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_string.cc b/sql/sql_string.cc index 0d604d043cc..654076c3f41 100644 --- a/sql/sql_string.cc +++ b/sql/sql_string.cc @@ -706,7 +706,7 @@ copy_and_convert(char *to, uint32 to_length, CHARSET_INFO *to_cs, char *to_start= to; uchar *to_end= (uchar*) to+to_length; - while ((uchar*) from < from_end) + while (1) { if ((cnvres=from_cs->mb_wc(from_cs, &wc, (uchar*) from, from_end)) > 0) from+= cnvres; |