Commit ef13523d authored by unknown's avatar unknown
Browse files

Bug #6815 SHOW CREATE TABLE hangs after upgrading to 4.1 

A test doesn't seem to be possible.
parent befcff9b

sql/sql_show.cc

+9 −0
Original line number Diff line number Diff line
@@ -1169,6 +1169,15 @@ append_identifier(THD *thd, String *packet, const char *name, uint length) 
  {

    uchar chr= (uchar) *name;

    length= my_mbcharlen(system_charset_info, chr);

    /*

      my_mbcharlen can retur 0 on a wrong multibyte

      sequence. It is possible when upgrading from 4.0,

      and identifier contains some accented characters.

      The manual says it does not work. So we'll just

      change length to 1 not to hang in the endless loop.

    */

    if (!length)

      length= 1;

    if (length == 1 && chr == (uchar) quote_char)

      packet->append(&quote_char, 1, system_charset_info);

    packet->append(name, length, packet->charset());