summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Barkov <bar@mariadb.com>2019-09-11 04:44:24 +0400
committerAlexander Barkov <bar@mariadb.com>2019-09-11 04:44:24 +0400
commit5ec4efb7b1b36006e629d258e396d8a95df127e1 (patch)
tree390ef1dff364bb4288c79a22ca4cfaebe69bce5d
parentacf0f2d59270ce8acc20e09c9c4d95091f13045f (diff)
downloadmariadb-git-5ec4efb7b1b36006e629d258e396d8a95df127e1.tar.gz
Adding missing semicolons to sql_yacc.yy (10.2)
-rw-r--r--sql/sql_yacc.yy54
1 files changed, 38 insertions, 16 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
index b5cece45148..468729b9bf9 100644
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -3550,6 +3550,7 @@ statement_information_item:
if ($$ == NULL)
MYSQL_YYABORT;
}
+ ;
simple_target_specification:
ident
@@ -3607,6 +3608,7 @@ condition_information_item:
if ($$ == NULL)
MYSQL_YYABORT;
}
+ ;
condition_information_item_name:
CLASS_ORIGIN_SYM
@@ -6561,15 +6563,18 @@ field_length:
'(' LONG_NUM ')' { $$= $2.str; }
| '(' ULONGLONG_NUM ')' { $$= $2.str; }
| '(' DECIMAL_NUM ')' { $$= $2.str; }
- | '(' NUM ')' { $$= $2.str; };
+ | '(' NUM ')' { $$= $2.str; }
+ ;
opt_field_length:
/* empty */ { $$= (char*) 0; /* use default length */ }
| field_length { $$= $1; }
+ ;
opt_field_length_default_1:
/* empty */ { $$= (char*) "1"; }
| field_length { $$= $1; }
+ ;
opt_precision:
/* empty */ { $$.set(0, 0); }
@@ -6989,12 +6994,14 @@ fulltext_key_opts:
opt_USING_key_algorithm:
/* Empty*/ { $$= HA_KEY_ALG_UNDEF; }
| USING btree_or_rtree { $$= $2; }
+ ;
/* TYPE is a valid identifier, so it's handled differently than USING */
opt_key_algorithm_clause:
/* Empty*/ { $$= HA_KEY_ALG_UNDEF; }
| USING btree_or_rtree { $$= $2; }
| TYPE_SYM btree_or_rtree { $$= $2; }
+ ;
key_using_alg:
USING btree_or_rtree
@@ -7106,7 +7113,8 @@ string_list:
text_string
{ Lex->last_field->interval_list.push_back($1, thd->mem_root); }
| string_list ',' text_string
- { Lex->last_field->interval_list.push_back($3, thd->mem_root); };
+ { Lex->last_field->interval_list.push_back($3, thd->mem_root); }
+ ;
/*
** Alter table
@@ -7755,6 +7763,7 @@ opt_index_lock_algorithm:
| alter_algorithm_option
| alter_lock_option alter_algorithm_option
| alter_algorithm_option alter_lock_option
+ ;
alter_algorithm_option:
ALGORITHM_SYM opt_equal DEFAULT
@@ -7813,6 +7822,7 @@ alter_option:
Lex->alter_info.requested_lock=
Alter_info::ALTER_TABLE_LOCK_NONE;
}
+ ;
opt_restrict:
@@ -8077,6 +8087,7 @@ persistent_stat_spec:
{}
| COLUMNS persistent_column_stat_spec INDEXES persistent_index_stat_spec
{}
+ ;
persistent_column_stat_spec:
ALL {}
@@ -8780,13 +8791,13 @@ select_alias:
opt_default_time_precision:
/* empty */ { $$= NOT_FIXED_DEC; }
| '(' ')' { $$= NOT_FIXED_DEC; }
- | '(' real_ulong_num ')' { $$= $2; };
+ | '(' real_ulong_num ')' { $$= $2; }
;
opt_time_precision:
/* empty */ { $$= 0; }
| '(' ')' { $$= 0; }
- | '(' real_ulong_num ')' { $$= $2; };
+ | '(' real_ulong_num ')' { $$= $2; }
;
optional_braces:
@@ -9265,6 +9276,7 @@ dyncall_create_element:
else
$$->len= 0;
}
+ ;
dyncall_create_list:
dyncall_create_element
@@ -10664,7 +10676,7 @@ opt_gconcat_separator:
opt_gorder_clause:
/* empty */
- | ORDER_SYM BY gorder_list;
+ | ORDER_SYM BY gorder_list
;
gorder_list:
@@ -11569,6 +11581,7 @@ opt_window_ref:
if (thd->lex->win_ref == NULL)
MYSQL_YYABORT;
}
+ ;
opt_window_partition_clause:
/* empty */ { }
@@ -11894,6 +11907,7 @@ limit_rows_option:
LEX *lex=Lex;
lex->limit_rows_examined= $1;
}
+ ;
delete_limit_clause:
/* empty */
@@ -12406,7 +12420,8 @@ insert_table:
lex->field_list.empty();
lex->many_values.empty();
lex->insert_list=0;
- };
+ }
+ ;
insert_field_spec:
insert_values {}
@@ -13424,6 +13439,7 @@ delete_domain_id:
optional_flush_tables_arguments:
/* empty */ {$$= 0;}
| AND_SYM DISABLE_SYM CHECKPOINT_SYM {$$= REFRESH_CHECKPOINT; }
+ ;
reset:
RESET_SYM
@@ -13516,6 +13532,7 @@ kill_type:
/* Empty */ { $$= (int) KILL_HARD_BIT; }
| HARD_SYM { $$= (int) KILL_HARD_BIT; }
| SOFT_SYM { $$= 0; }
+ ;
kill_option:
/* empty */ { $$= (int) KILL_CONNECTION; }
@@ -13690,7 +13707,8 @@ line_term:
opt_xml_rows_identified_by:
/* empty */ { }
| ROWS_SYM IDENTIFIED_SYM BY text_string
- { Lex->exchange->line_term = $4; };
+ { Lex->exchange->line_term = $4; }
+ ;
opt_ignore_lines:
/* empty */
@@ -14507,6 +14525,7 @@ TEXT_STRING_filesystem:
MYSQL_YYABORT;
}
}
+ ;
ident_table_alias:
IDENT_sys { $$= $1; }
@@ -15799,12 +15818,14 @@ grant_command:
;
opt_with_admin:
- /* nothing */ { Lex->definer = 0; }
- | WITH ADMIN_SYM user_or_role { Lex->definer = $3; }
+ /* nothing */ { Lex->definer = 0; }
+ | WITH ADMIN_SYM user_or_role { Lex->definer = $3; }
+ ;
opt_with_admin_option:
- /* nothing */ { Lex->with_admin_option= false; }
- | WITH ADMIN_SYM OPTION { Lex->with_admin_option= true; }
+ /* nothing */ { Lex->with_admin_option= false; }
+ | WITH ADMIN_SYM OPTION { Lex->with_admin_option= true; }
+ ;
role_list:
grant_role
@@ -16231,7 +16252,7 @@ opt_release:
{ $$= TVL_UNKNOWN; }
| RELEASE_SYM { $$= TVL_YES; }
| NO_SYM RELEASE_SYM { $$= TVL_NO; }
-;
+ ;
opt_savepoint:
/* empty */ {}
@@ -17052,10 +17073,11 @@ uninstall:
/* Avoid compiler warning from sql_yacc.cc where yyerrlab1 is not used */
keep_gcc_happy:
- IMPOSSIBLE_ACTION
- {
- YYERROR;
- }
+ IMPOSSIBLE_ACTION
+ {
+ YYERROR;
+ }
+ ;
/**
@} (end of group Parser)