database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Mistakes corrected, variable defined.

Browse Source
This commit is contained in:
Galina Shalygina
2017-10-28 21:54:22 +02:00
parent a4ded0a9b5
commit 99d3f217eb
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/sql_lex.cc
View File

@ -1350,9 +1350,8 @@ int MYSQLlex(YYSTYPE *yylval, THD *thd)
}
break;
case VALUES:
if (thd->lex->current_select->parsing_place == IN_UPDATE_ON_DUP_KEY
// || thd->lex->current_select->parsing_place == IN_PARTITIONING
)
if (thd->lex->current_select->parsing_place == IN_UPDATE_ON_DUP_KEY ||
thd->lex->current_select->parsing_place == IN_PART_FUNC)
return VALUE_SYM;
token= lex_one_token(yylval, thd);
lip->add_digest_token(token, yylval);

2
sql/sql_priv.h
View File

@ -350,7 +350,7 @@ enum enum_parsing_place
IN_GROUP_BY,
IN_ORDER_BY,
IN_UPDATE_ON_DUP_KEY,
IN_PARTITIONING,
IN_PART_FUNC,
PARSING_PLACE_SIZE /* always should be the last */
};