mirror of
https://github.com/MariaDB/server.git
synced 2025-08-01 03:47:19 +03:00
After-merge fixes.
mysql-test/r/trigger-grant.result: Updated the result file. mysql-test/r/view_grant.result: Updated the result file. mysql-test/t/trigger-grant.test: A patch for BUG#13198 has been merged, so need to update the test case. mysql-test/t/view_grant.test: A patch for BUG#16777 has been merged, so need to update the test case. sql/sql_parse.cc: After-merge fix (should have been a part of fix for BUG#16777). sql/sql_show.cc: After-merge fix -- empty identifier should be quoted.
This commit is contained in:
@ -831,7 +831,7 @@ append_identifier(THD *thd, String *packet, const char *name, uint length)
|
||||
|
||||
int get_quote_char_for_identifier(THD *thd, const char *name, uint length)
|
||||
{
|
||||
if (!length ||
|
||||
if (length &&
|
||||
!is_keyword(name,length) &&
|
||||
!require_quotes(name, length) &&
|
||||
!(thd->options & OPTION_QUOTE_SHOW_CREATE))
|
||||
|
Reference in New Issue
Block a user