upmerge to bug#14548159

This commit is contained in:
Rohit Kalhans 2012-09-22 18:07:04 +05:30
commit 4802faad3f
24 changed files with 835 additions and 660 deletions

View file

@ -952,7 +952,8 @@ append_identifier(THD *thd, String *packet, const char *name, uint length)
{
const char *name_end;
char quote_char;
int q= get_quote_char_for_identifier(thd, name, length);
int q;
q= thd ? get_quote_char_for_identifier(thd, name, length) : '`';
if (q == EOF)
{