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

sql_yacc.yy: Removing union_opt.

Browse source 
Using /*empty*/, union_list, union_order_or_limit instead.
This is to get rid of lex->current_select->braces easier
(separately in union_list and in union_order_or_limit)
This commit is contained in:
Alexander Barkov 2016-05-25 18:36:51 +04:00
parent 971538f4c2
commit 1f89ea8ea0
1 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
sql/sql_yacc.yy
View file

@ -4945,7 +4945,10 @@ create_body:
CREATE TABLE t1 (SELECT 1); CREATE TABLE t1 (SELECT 1);
*/ */
| '(' create_select_query_specification ')' | '(' create_select_query_specification ')'
{ Select->set_braces(1);} union_opt {} | '(' create_select_query_specification ')'
{ Select->set_braces(1);} union_list {}
| '(' create_select_query_specification ')'
{ Select->set_braces(1);} union_order_or_limit {}
| create_like | create_like
{ {
@ -4977,7 +4980,10 @@ create_select_query_expression_body:
| SELECT_SYM create_select_part2 create_select_part3_union_not_ready | SELECT_SYM create_select_part2 create_select_part3_union_not_ready
create_select_part4 create_select_part4
| '(' create_select_query_specification ')' | '(' create_select_query_specification ')'
{ Select->set_braces(1);} union_opt {} | '(' create_select_query_specification ')'
{ Select->set_braces(1);} union_list {}
| '(' create_select_query_specification ')'
{ Select->set_braces(1);} union_order_or_limit {}
; ;
opt_create_partitioning: opt_create_partitioning:
@ -8536,12 +8542,16 @@ select:
select_init: select_init:
SELECT_SYM select_options_and_item_list select_init3 SELECT_SYM select_options_and_item_list select_init3
| '(' select_paren ')' union_opt | '(' select_paren ')'
| '(' select_paren ')' union_list
| '(' select_paren ')' union_order_or_limit
; ;
union_list_part2: union_list_part2:
SELECT_SYM select_options_and_item_list select_init3_union_query_term SELECT_SYM select_options_and_item_list select_init3_union_query_term
| '(' select_paren_union_query_term ')' union_opt | '(' select_paren_union_query_term ')'
| '(' select_paren_union_query_term ')' union_list
| '(' select_paren_union_query_term ')' union_order_or_limit
; ;
select_paren: select_paren:
@ -16433,12 +16443,6 @@ union_list_view:
} }
; ;
union_opt:
/* Empty */
| union_order_or_limit
| union_list
;
union_order_or_limit: union_order_or_limit:
{ {
LEX *lex= thd->lex; LEX *lex= thd->lex;