Commit 53484855 authored by bar@mysql.com's avatar bar@mysql.com

sql_show.cc:

  ctype_recode does not hang anymore. Small fix after Marko's change.
parent e554888b
...@@ -1136,7 +1136,7 @@ static const char *require_quotes(const char *name, uint name_length) ...@@ -1136,7 +1136,7 @@ static const char *require_quotes(const char *name, uint name_length)
for ( ; name < end ; name++) for ( ; name < end ; name++)
{ {
uchar chr= (uchar) *name; uchar chr= (uchar) *name;
length= my_mbcharlen(system_charset_info, chr); length= my_mbcharlen(system_charset_info, (uchar) chr);
if (length == 1 && !system_charset_info->ident_map[chr]) if (length == 1 && !system_charset_info->ident_map[chr])
return name; return name;
} }
...@@ -1165,7 +1165,7 @@ append_identifier(THD *thd, String *packet, const char *name, uint length) ...@@ -1165,7 +1165,7 @@ append_identifier(THD *thd, String *packet, const char *name, uint length)
for (name_end= name+length ; name < name_end ; name+= length) for (name_end= name+length ; name < name_end ; name+= length)
{ {
char chr= *name; char chr= *name;
length= my_mbcharlen(system_charset_info, chr); length= my_mbcharlen(system_charset_info, (uchar) chr);
if (length == 1 && chr == quote_char) if (length == 1 && chr == quote_char)
packet->append(&quote_char, 1, system_charset_info); packet->append(&quote_char, 1, system_charset_info);
packet->append(name, length, packet->charset()); packet->append(name, length, packet->charset());
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment