Commit be527f30 authored by anozdrin@mysql.com's avatar anozdrin@mysql.com

Fix for multiple test failures on some platforms.

parent 0903941d
...@@ -223,7 +223,7 @@ static int find_keyword(LEX *lex, uint len, bool function) ...@@ -223,7 +223,7 @@ static int find_keyword(LEX *lex, uint len, bool function)
SYNOPSIS SYNOPSIS
is_keyword() is_keyword()
name checked name name checked name (must not be empty)
len length of checked name len length of checked name
RETURN VALUES RETURN VALUES
...@@ -233,6 +233,7 @@ static int find_keyword(LEX *lex, uint len, bool function) ...@@ -233,6 +233,7 @@ static int find_keyword(LEX *lex, uint len, bool function)
bool is_keyword(const char *name, uint len) bool is_keyword(const char *name, uint len)
{ {
DBUG_ASSERT(len != 0);
return get_hash_symbol(name,len,0)!=0; return get_hash_symbol(name,len,0)!=0;
} }
......
...@@ -713,7 +713,8 @@ append_identifier(THD *thd, String *packet, const char *name, uint length) ...@@ -713,7 +713,8 @@ append_identifier(THD *thd, String *packet, const char *name, uint length)
int get_quote_char_for_identifier(THD *thd, const char *name, uint length) int get_quote_char_for_identifier(THD *thd, const char *name, uint length)
{ {
if (!is_keyword(name,length) && if (!length ||
!is_keyword(name,length) &&
!require_quotes(name, length) && !require_quotes(name, length) &&
!(thd->options & OPTION_QUOTE_SHOW_CREATE)) !(thd->options & OPTION_QUOTE_SHOW_CREATE))
return EOF; return EOF;
......
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