summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorunknown <Sinisa@sinisa.nasamreza.org>2003-07-02 01:24:05 +0300
committerunknown <Sinisa@sinisa.nasamreza.org>2003-07-02 01:24:05 +0300
commit417c571bb345475bd1794264b18484f874910b85 (patch)
tree184e63c12f9a193dd78b7bc697ff5ea96bb66fcc /sql
parent65d7980556227be9371d4fc2592cbe5c1140689c (diff)
downloadmariadb-git-417c571bb345475bd1794264b18484f874910b85.tar.gz
Some fixes for CREATE / INSERT FROM UNIO >..
Diffstat (limited to 'sql')
-rw-r--r--sql/sql_yacc.yy9
1 files changed, 3 insertions, 6 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
index 8b0e3dfe8d7..cf580b3f3df 100644
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -597,7 +597,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 opt_union union_list
- precision union_option
+ precision union_option opt_and
END_OF_INPUT
%type <NONE>
@@ -2640,9 +2640,7 @@ insert_field_spec:
lex->many_values.push_back(lex->insert_list))
YYABORT;
}
- ident_eq_list
- | select_for_insert {}
- ;
+ ident_eq_list;
opt_field_spec:
/* empty */ { }
@@ -2651,8 +2649,7 @@ opt_field_spec:
fields:
fields ',' insert_ident { Lex->field_list.push_back($3); }
- | insert_ident { Lex->field_list.push_back($1); }
- ;
+ | insert_ident { Lex->field_list.push_back($1); };
insert_values:
VALUES values_list {}