diff options
| author | unknown <bell@sanja.is.com.ua> | 2002-12-08 17:28:11 +0200 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2002-12-08 17:28:11 +0200 |
| commit | b392b78400abf319550eedd636faa9eae66b9510 (patch) | |
| tree | 5fff9988a3add9fc99cd44a695b068cd3dde464c | |
| parent | a20a8ffba6146d79dc370aa88c39c2dae4b395a1 (diff) | |
| parent | d7fa62cbc65bdc30e30a17d68f6b419d9d069932 (diff) | |
| download | mariadb-git-b392b78400abf319550eedd636faa9eae66b9510.tar.gz | |
Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/work-leak-4.1
| -rw-r--r-- | sql/sql_yacc.yy | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 5e5c9117c61..ed8e8f0fb51 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -664,7 +664,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b,int *yystacksize); handler_rkey_function handler_read_or_scan single_multi table_wild_list table_wild_one opt_wild union_clause union_list union_option - precision opt_on_delete_item subselect_start opt_and + precision subselect_start opt_and subselect_end select_var_list select_var_list_init help opt_len END_OF_INPUT @@ -921,7 +921,7 @@ create_table_options_space_separated: create_table_options: create_table_option - | create_table_option create_table_options; + | create_table_option create_table_options | create_table_option ',' create_table_options; create_table_option: @@ -1387,7 +1387,6 @@ alter: } alter_list {} - ; | ALTER DATABASE ident opt_db_default_character_set { LEX *lex=Lex; @@ -2811,6 +2810,7 @@ select_var_list_init: YYABORT; } select_var_list + {} ; select_var_list: @@ -2942,6 +2942,7 @@ insert: Select->set_lock_for_tables($3); } insert_field_spec opt_insert_update + {} ; replace: |