database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

removed switching off static table optimization for subselects (SCRUM , pre-commit to be able merge with temporary table fix)

Browse Source 
sql/item.cc:
  report other table for outer reference
sql/item.h:
  report other table for outer reference
sql/item_cmpfunc.cc:
  report other table for outer reference
sql/sql_select.cc:
  removed switching off static table optimization for subselects
This commit is contained in:
unknown
2003-01-26 21:13:37 +02:00
parent 3fe840ee07
commit fb2226c376
4 changed files with 24 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
sql/sql_select.cc
View File

@ -442,16 +442,6 @@ JOIN::optimize()
thd->fatal_error)
DBUG_RETURN(1);
if (select_lex->dependent)
{
/*
Just remove all const-table optimization in case of depended query
TODO: optimize
*/
const_table_map= 0;
const_tables= 0;
found_const_table_map= 0;
}
thd->proc_info= "preparing";
if (result->initialize_tables(this))
{
@ -4681,8 +4671,11 @@ do_select(JOIN *join,List<Item> *fields,TABLE *table,Procedure *procedure)
join->send_records=0;
if (join->tables == join->const_tables)
{
if (!(error=(*end_select)(join,join_tab,0)) || error == -3)
error=(*end_select)(join,join_tab,1);
if (!join->select_lex->dependent ||
((!join->conds || join->conds->val_int()) &&
(!join->having || join->having->val_int())))
if (!(error=(*end_select)(join,join_tab,0)) || error == -3)
error=(*end_select)(join,join_tab,1);
}
else
{