diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc
index 58bce754773..395f3c7e02a 100644
--- a/sql/sql_lex.cc
+++ b/sql/sql_lex.cc
@@ -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);
diff --git a/sql/sql_priv.h b/sql/sql_priv.h
index 245eb7fbe3d..e200a23b7c0 100644
--- a/sql/sql_priv.h
+++ b/sql/sql_priv.h
@@ -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 */
 };