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

MWL#90: Post-merge fixes

Browse source
This commit is contained in:
Sergey Petrunya 2010-12-17 00:19:57 +03:00
parent 1bf3964fbe
commit 6bf60dc388
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
sql/sql_select.cc
View file

@ -243,6 +243,9 @@ static uint make_join_orderinfo(JOIN *join);
Item_equal *find_item_equal(COND_EQUAL *cond_equal, Field *field, Item_equal *find_item_equal(COND_EQUAL *cond_equal, Field *field,
bool *inherited_fl); bool *inherited_fl);
JOIN_TAB *first_linear_tab(JOIN *join, bool after_const_tables);
JOIN_TAB *next_linear_tab(JOIN* join, JOIN_TAB* tab, bool include_bush_roots);
/** /**
This handles SELECT with and without UNION. This handles SELECT with and without UNION.
*/ */
@ -1582,9 +1585,12 @@ bool JOIN::setup_subquery_caches()
if (conds) if (conds)
conds= conds->transform(&Item::expr_cache_insert_transformer, conds= conds->transform(&Item::expr_cache_insert_transformer,
(uchar*) thd); (uchar*) thd);
for (JOIN_TAB *tab= join_tab + const_tables; for (JOIN_TAB *tab= first_linear_tab(this, TRUE);
tab < join_tab + tables ; tab;
tab++) tab= next_linear_tab(this, tab, TRUE))
//for (JOIN_TAB *tab= join_tab + const_tables;
// tab < join_tab + tables ;
// tab++)
{ {
if (tab->select_cond) if (tab->select_cond)
tab->select_cond= tab->select_cond=