mirror of
https://github.com/MariaDB/server.git
synced 2025-08-07 00:04:31 +03:00
sql_show.cc:
ctype_recode does not hang anymore. Small fix after Marko's change. sql/sql_show.cc: ctype_recode does not hang anymore. Small fix after Marko's change.
This commit is contained in:
@@ -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)
|
|||||||
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("e_char, 1, system_charset_info);
|
packet->append("e_char, 1, system_charset_info);
|
||||||
packet->append(name, length, packet->charset());
|
packet->append(name, length, packet->charset());
|
||||||
|
Reference in New Issue
Block a user