diff options
| author | monty@narttu.mysql.fi <> | 2003-06-04 18:28:51 +0300 |
|---|---|---|
| committer | monty@narttu.mysql.fi <> | 2003-06-04 18:28:51 +0300 |
| commit | 23145cfed72954c29f5a47e82af22898164be4b0 (patch) | |
| tree | f2e86edc169afb1fed9cecefdecd9f13561780c9 /sql/sql_yacc.yy | |
| parent | 7df5635ff2845bd708711f6b790997a3c68d5f2a (diff) | |
| download | mariadb-git-23145cfed72954c29f5a47e82af22898164be4b0.tar.gz | |
Added SQLSTATE to client/server protocol
bmove_allign -> bmove_align
Added OLAP function ROLLUP
Split mysql_fix_privilege_tables to a script and a .sql data file
Added new (MEMROOT*) functions to avoid calling current_thd() when creating some common objects.
Added table_alias_charset, for easier --lower-case-table-name handling
Better SQL_MODE handling (Setting complex options also sets sub options)
New (faster) assembler string functions for x86
Diffstat (limited to 'sql/sql_yacc.yy')
| -rw-r--r-- | sql/sql_yacc.yy | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 1d735730801..efb5e42626d 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -2971,7 +2971,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 { @@ -2983,8 +2983,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 */ } ; @@ -3039,20 +3037,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: |