database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

An interim code cleanup.

Browse Source 
Major re-write of code yet has to be done, to circumvent
assigning of UNIT to current select and to deal better with 
offset, limit.
This commit is contained in:
Sinisa@sinisa.nasamreza.org
2003-03-07 21:47:04 +02:00
parent 57ed8b11fd
commit 4d4ac0ede3
3 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mysql-test/r/union.result
View File

@ -267,4 +267,3 @@ id select_type table type possible_keys key key_len ref rows Extra
1 PRIMARY t1 const PRIMARY PRIMARY 4 const 1 1 PRIMARY t1 const PRIMARY PRIMARY 4 const 1
2 UNION t1 ref b b 5 const 1 Using where 2 UNION t1 ref b b 5 const 1 Using where
drop table t1,t2; drop table t1,t2;
>>>>>>>

1
sql/sql_parse.cc
View File

@ -3275,7 +3275,6 @@ mysql_new_select(LEX *lex, bool move_down)
select_lex->include_neighbour(lex->current_select); select_lex->include_neighbour(lex->current_select);
select_lex->master_unit()->global_parameters= select_lex; select_lex->master_unit()->global_parameters= select_lex;
DBUG_ASSERT(lex->current_select->linkage != GLOBAL_OPTIONS_TYPE);
select_lex->include_global((st_select_lex_node**)&lex->all_selects_list); select_lex->include_global((st_select_lex_node**)&lex->all_selects_list);
lex->current_select= select_lex; lex->current_select= select_lex;
return 0; return 0;

8
sql/sql_yacc.yy
View File

@ -4744,10 +4744,10 @@ optional_order_or_limit:
LEX *lex= &thd->lex; LEX *lex= &thd->lex;
DBUG_ASSERT(lex->current_select->linkage != GLOBAL_OPTIONS_TYPE); DBUG_ASSERT(lex->current_select->linkage != GLOBAL_OPTIONS_TYPE);
SELECT_LEX *sel= lex->current_select->select_lex(); SELECT_LEX *sel= lex->current_select->select_lex();
sel->master_unit()->global_parameters= SELECT_LEX_UNIT *unit= sel->master_unit();
sel->master_unit(); unit->global_parameters= unit;
lex->current_select= sel->master_unit(); unit->no_table_names_allowed= 1;
lex->current_select->no_table_names_allowed= 1; lex->current_select= unit;
thd->where= "global ORDER clause"; thd->where= "global ORDER clause";
} }
order_or_limit order_or_limit