diff options
| author | unknown <bell@sanja.is.com.ua> | 2002-11-27 12:31:32 +0200 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2002-11-27 12:31:32 +0200 |
| commit | 8ff65ac252d44d883b00c240a5bccd2dedfa609b (patch) | |
| tree | 64b54745042c10b83f0e86d2809053315b74d592 /sql/sql_yacc.yy | |
| parent | 9767982aedb23183e8fc9d5ba636971e0d81a2b5 (diff) | |
| download | mariadb-git-8ff65ac252d44d883b00c240a5bccd2dedfa609b.tar.gz | |
after merging fix
Diffstat (limited to 'sql/sql_yacc.yy')
| -rw-r--r-- | sql/sql_yacc.yy | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index af5d6690133..cbe72313b93 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -654,7 +654,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b,int *yystacksize); table_to_table_list table_to_table opt_table_list opt_as handler_rkey_function handler_read_or_scan single_multi table_wild_list table_wild_one opt_wild - union union_option + union union_list union_option precision opt_on_delete_item subselect_start opt_and subselect_end select_var_list select_var_list_init help opt_len END_OF_INPUT @@ -1254,8 +1254,8 @@ opt_binary: opt_primary: /* empty */ - | PRIMARY_SYM - + | PRIMARY_SYM; + references: REFERENCES table_ident { @@ -4316,7 +4316,11 @@ rollback: union: /* empty */ {} - |UNION_SYM union_option + | union_list + ; + +union_list: + UNION_SYM union_option { LEX *lex=Lex; if (lex->exchange) |