mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 20:42:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Adding missing semicolons to sql_yacc_ora.yy (10.3), indentation cleanups.

Browse source
This commit is contained in:
Alexander Barkov 2019-09-11 10:13:19 +04:00
parent f1309fac33
commit f1616bacb7
1 changed files with 44 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
sql/sql_yacc_ora.yy
View file

@ -13,7 +13,7 @@
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/* sql_yacc.yy */ /* sql_yacc.yy */
@ -3734,6 +3734,7 @@ statement_information_item:
if (unlikely($$ == NULL)) if (unlikely($$ == NULL))
MYSQL_YYABORT; MYSQL_YYABORT;
} }
;
simple_target_specification: simple_target_specification:
ident_cli ident_cli
@ -3790,6 +3791,7 @@ condition_information_item:
if (unlikely($$ == NULL)) if (unlikely($$ == NULL))
MYSQL_YYABORT; MYSQL_YYABORT;
} }
;
condition_information_item_name: condition_information_item_name:
CLASS_ORIGIN_SYM CLASS_ORIGIN_SYM
@ -7133,15 +7135,18 @@ field_length:
'(' LONG_NUM ')' { $$= $2.str; } '(' LONG_NUM ')' { $$= $2.str; }
| '(' ULONGLONG_NUM ')' { $$= $2.str; } | '(' ULONGLONG_NUM ')' { $$= $2.str; }
| '(' DECIMAL_NUM ')' { $$= $2.str; } | '(' DECIMAL_NUM ')' { $$= $2.str; }
| '(' NUM ')' { $$= $2.str; }; | '(' NUM ')' { $$= $2.str; }
;
opt_field_length: opt_field_length:
/* empty */ { $$= (char*) 0; /* use default length */ } /* empty */ { $$= (char*) 0; /* use default length */ }
| field_length { $$= $1; } | field_length { $$= $1; }
;
opt_field_length_default_1: opt_field_length_default_1:
/* empty */ { $$= (char*) "1"; } /* empty */ { $$= (char*) "1"; }
| field_length { $$= $1; } | field_length { $$= $1; }
;
/* /*
@ -7164,10 +7169,12 @@ opt_field_length_default_1:
opt_field_length_default_sp_param_varchar: opt_field_length_default_sp_param_varchar:
/* empty */ { $$.set("4000", "4000"); } /* empty */ { $$.set("4000", "4000"); }
| field_length { $$.set($1, NULL); } | field_length { $$.set($1, NULL); }
;
opt_field_length_default_sp_param_char: opt_field_length_default_sp_param_char:
/* empty */ { $$.set("2000", "2000"); } /* empty */ { $$.set("2000", "2000"); }
| field_length { $$.set($1, NULL); } | field_length { $$.set($1, NULL); }
;
opt_precision: opt_precision:
/* empty */ { $$.set(0, 0); } /* empty */ { $$.set(0, 0); }
@ -7671,12 +7678,14 @@ fulltext_key_opts:
opt_USING_key_algorithm: opt_USING_key_algorithm:
/* Empty*/ { $$= HA_KEY_ALG_UNDEF; } /* Empty*/ { $$= HA_KEY_ALG_UNDEF; }
| USING btree_or_rtree { $$= $2; } | USING btree_or_rtree { $$= $2; }
;
/* TYPE is a valid identifier, so it's handled differently than USING */ /* TYPE is a valid identifier, so it's handled differently than USING */
opt_key_algorithm_clause: opt_key_algorithm_clause:
/* Empty*/ { $$= HA_KEY_ALG_UNDEF; } /* Empty*/ { $$= HA_KEY_ALG_UNDEF; }
| USING btree_or_rtree { $$= $2; } | USING btree_or_rtree { $$= $2; }
| TYPE_SYM btree_or_rtree { $$= $2; } | TYPE_SYM btree_or_rtree { $$= $2; }
;
key_using_alg: key_using_alg:
USING btree_or_rtree USING btree_or_rtree
@ -7787,7 +7796,8 @@ string_list:
text_string text_string
{ Lex->last_field->interval_list.push_back($1, thd->mem_root); } { Lex->last_field->interval_list.push_back($1, thd->mem_root); }
| string_list ',' text_string | 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 ** Alter table
@ -8454,6 +8464,7 @@ opt_index_lock_algorithm:
| alter_algorithm_option | alter_algorithm_option
| alter_lock_option alter_algorithm_option | alter_lock_option alter_algorithm_option
| alter_algorithm_option alter_lock_option | alter_algorithm_option alter_lock_option
;
alter_algorithm_option: alter_algorithm_option:
ALGORITHM_SYM opt_equal DEFAULT ALGORITHM_SYM opt_equal DEFAULT
@ -8512,6 +8523,7 @@ alter_option:
Lex->alter_info.requested_lock= Lex->alter_info.requested_lock=
Alter_info::ALTER_TABLE_LOCK_NONE; Alter_info::ALTER_TABLE_LOCK_NONE;
} }
;
opt_restrict: opt_restrict:
@ -8779,6 +8791,7 @@ persistent_stat_spec:
{} {}
| COLUMNS persistent_column_stat_spec INDEXES persistent_index_stat_spec | COLUMNS persistent_column_stat_spec INDEXES persistent_index_stat_spec
{} {}
;
persistent_column_stat_spec: persistent_column_stat_spec:
ALL {} ALL {}
@ -9597,13 +9610,13 @@ select_alias:
opt_default_time_precision: opt_default_time_precision:
/* empty */ { $$= NOT_FIXED_DEC; } /* empty */ { $$= NOT_FIXED_DEC; }
| '(' ')' { $$= NOT_FIXED_DEC; } | '(' ')' { $$= NOT_FIXED_DEC; }
| '(' real_ulong_num ')' { $$= $2; }; | '(' real_ulong_num ')' { $$= $2; }
; ;
opt_time_precision: opt_time_precision:
/* empty */ { $$= 0; } /* empty */ { $$= 0; }
| '(' ')' { $$= 0; } | '(' ')' { $$= 0; }
| '(' real_ulong_num ')' { $$= $2; }; | '(' real_ulong_num ')' { $$= $2; }
; ;
optional_braces: optional_braces:
@ -10108,6 +10121,7 @@ dyncall_create_element:
else else
$$->len= 0; $$->len= 0;
} }
;
dyncall_create_list: dyncall_create_list:
dyncall_create_element dyncall_create_element
@ -11588,7 +11602,7 @@ opt_gconcat_separator:
opt_gorder_clause: opt_gorder_clause:
/* empty */ /* empty */
| ORDER_SYM BY gorder_list; | ORDER_SYM BY gorder_list
; ;
gorder_list: gorder_list:
@ -12605,6 +12619,7 @@ opt_window_ref:
if (unlikely(thd->lex->win_ref == NULL)) if (unlikely(thd->lex->win_ref == NULL))
MYSQL_YYABORT; MYSQL_YYABORT;
} }
;
opt_window_partition_clause: opt_window_partition_clause:
/* empty */ { } /* empty */ { }
@ -12913,6 +12928,7 @@ limit_rows_option:
LEX *lex=Lex; LEX *lex=Lex;
lex->limit_rows_examined= $1; lex->limit_rows_examined= $1;
} }
;
delete_limit_clause: delete_limit_clause:
/* empty */ /* empty */
@ -12939,6 +12955,7 @@ opt_plus:
int_num: int_num:
opt_plus NUM { int error; $$= (int) my_strtoll10($2.str, (char**) 0, &error); } opt_plus NUM { int error; $$= (int) my_strtoll10($2.str, (char**) 0, &error); }
| '-' NUM { int error; $$= -(int) my_strtoll10($2.str, (char**) 0, &error); } | '-' NUM { int error; $$= -(int) my_strtoll10($2.str, (char**) 0, &error); }
;
ulong_num: ulong_num:
opt_plus NUM { int error; $$= (ulong) my_strtoll10($2.str, (char**) 0, &error); } opt_plus NUM { int error; $$= (ulong) my_strtoll10($2.str, (char**) 0, &error); }
@ -12962,7 +12979,7 @@ longlong_num:
| LONG_NUM { int error; $$= (longlong) my_strtoll10($1.str, (char**) 0, &error); } | LONG_NUM { int error; $$= (longlong) my_strtoll10($1.str, (char**) 0, &error); }
| '-' NUM { int error; $$= -(longlong) my_strtoll10($2.str, (char**) 0, &error); } | '-' NUM { int error; $$= -(longlong) my_strtoll10($2.str, (char**) 0, &error); }
| '-' LONG_NUM { int error; $$= -(longlong) my_strtoll10($2.str, (char**) 0, &error); } | '-' LONG_NUM { int error; $$= -(longlong) my_strtoll10($2.str, (char**) 0, &error); }
;
ulonglong_num: ulonglong_num:
opt_plus NUM { int error; $$= (ulonglong) my_strtoll10($2.str, (char**) 0, &error); } opt_plus NUM { int error; $$= (ulonglong) my_strtoll10($2.str, (char**) 0, &error); }
@ -12999,7 +13016,7 @@ bool:
ulong_num { $$= $1 != 0; } ulong_num { $$= $1 != 0; }
| TRUE_SYM { $$= 1; } | TRUE_SYM { $$= 1; }
| FALSE_SYM { $$= 0; } | FALSE_SYM { $$= 0; }
;
procedure_clause: procedure_clause:
PROCEDURE_SYM ident /* Procedure name */ PROCEDURE_SYM ident /* Procedure name */
@ -13468,7 +13485,8 @@ insert_table:
lex->field_list.empty(); lex->field_list.empty();
lex->many_values.empty(); lex->many_values.empty();
lex->insert_list=0; lex->insert_list=0;
}; }
;
insert_field_spec: insert_field_spec:
insert_values {} insert_values {}
@ -14633,6 +14651,7 @@ delete_domain_id:
optional_flush_tables_arguments: optional_flush_tables_arguments:
/* empty */ {$$= 0;} /* empty */ {$$= 0;}
| AND_SYM DISABLE_SYM CHECKPOINT_SYM {$$= REFRESH_CHECKPOINT; } | AND_SYM DISABLE_SYM CHECKPOINT_SYM {$$= REFRESH_CHECKPOINT; }
;
reset: reset:
RESET_SYM RESET_SYM
@ -14725,6 +14744,7 @@ kill_type:
/* Empty */ { $$= (int) KILL_HARD_BIT; } /* Empty */ { $$= (int) KILL_HARD_BIT; }
| HARD_SYM { $$= (int) KILL_HARD_BIT; } | HARD_SYM { $$= (int) KILL_HARD_BIT; }
| SOFT_SYM { $$= 0; } | SOFT_SYM { $$= 0; }
;
kill_option: kill_option:
/* empty */ { $$= (int) KILL_CONNECTION; } /* empty */ { $$= (int) KILL_CONNECTION; }
@ -14901,7 +14921,8 @@ line_term:
opt_xml_rows_identified_by: opt_xml_rows_identified_by:
/* empty */ { } /* empty */ { }
| ROWS_SYM IDENTIFIED_SYM BY text_string | ROWS_SYM IDENTIFIED_SYM BY text_string
{ Lex->exchange->line_term = $4; }; { Lex->exchange->line_term = $4; }
;
opt_ignore_lines: opt_ignore_lines:
/* empty */ /* empty */
@ -17028,10 +17049,12 @@ grant_command:
opt_with_admin: opt_with_admin:
/* nothing */ { Lex->definer = 0; } /* nothing */ { Lex->definer = 0; }
| WITH ADMIN_SYM user_or_role { Lex->definer = $3; } | WITH ADMIN_SYM user_or_role { Lex->definer = $3; }
;
opt_with_admin_option: opt_with_admin_option:
/* nothing */ { Lex->with_admin_option= false; } /* nothing */ { Lex->with_admin_option= false; }
| WITH ADMIN_SYM OPTION { Lex->with_admin_option= true; } | WITH ADMIN_SYM OPTION { Lex->with_admin_option= true; }
;
role_list: role_list:
grant_role grant_role
@ -17526,7 +17549,7 @@ unit_type_decl:
{ $$= INTERSECT_TYPE; } { $$= INTERSECT_TYPE; }
| EXCEPT_SYM | EXCEPT_SYM
{ $$= EXCEPT_TYPE; } { $$= EXCEPT_TYPE; }
;
union_clause: union_clause:
/* empty */ {} /* empty */ {}
@ -18236,6 +18259,7 @@ keep_gcc_happy:
{ {
YYERROR; YYERROR;
} }
;
/** /**
@} (end of group Parser) @} (end of group Parser)