diff options
Diffstat (limited to 'sql/sql_yacc.yy')
| -rw-r--r-- | sql/sql_yacc.yy | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 9b2808f93a8..5219a8df04a 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -2975,7 +2975,7 @@ olap_opt: } lex->current_select->select_lex()->olap= CUBE_TYPE; net_printf(lex->thd, ER_NOT_SUPPORTED_YET, "CUBE"); - YYABORT; /* To be deleted in 4.1 */ + YYABORT; /* To be deleted in 5.1 */ } | WITH ROLLUP_SYM { @@ -2987,8 +2987,6 @@ olap_opt: YYABORT; } lex->current_select->select_lex()->olap= ROLLUP_TYPE; - net_printf(lex->thd, ER_NOT_SUPPORTED_YET, "ROLLUP"); - YYABORT; /* To be deleted in 4.1 */ } ; @@ -3043,20 +3041,7 @@ opt_limit_clause: ; limit_clause: - LIMIT - { - LEX *lex= Lex; - if (lex->current_select->linkage != GLOBAL_OPTIONS_TYPE && - lex->current_select->select_lex()->olap != - UNSPECIFIED_OLAP_TYPE) - { - net_printf(lex->thd, ER_WRONG_USAGE, "CUBE/ROLLUP", - "LIMIT"); - YYABORT; - } - } - limit_options - {} + LIMIT limit_options {} ; limit_options: @@ -4343,6 +4328,7 @@ keyword: | SHARE_SYM {} | SHUTDOWN {} | SLAVE {} + | SOUNDS_SYM {} | SQL_CACHE_SYM {} | SQL_BUFFER_RESULT {} | SQL_NO_CACHE_SYM {} @@ -4367,8 +4353,8 @@ keyword: | VARIABLES {} | VALUE_SYM {} | WORK_SYM {} + | X509_SYM {} | YEAR_SYM {} - | SOUNDS_SYM {} ; /* Option functions */ |