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

Merge of the mwl106 tree into the latest 5.3 tree.

Browse Source 
Resolved conflicts. Adjusted some test results
This commit is contained in:
Igor Babaev
2010-09-23 08:10:53 -07:00
parent cfbd927024 709a0a1310
commit b969df8bbd
72 changed files with 4103 additions and 928 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
sql/item_subselect.cc
View File

@@ -3018,6 +3018,9 @@ int subselect_uniquesubquery_engine::exec()
DBUG_RETURN(0);
}
if (!tab->preread_init_done && tab->preread_init())
DBUG_RETURN(1);
if (null_keypart)
DBUG_RETURN(scan_table());
@@ -3150,7 +3153,7 @@ subselect_uniquesubquery_engine::~subselect_uniquesubquery_engine()
int subselect_indexsubquery_engine::exec()
{
DBUG_ENTER("subselect_indexsubquery_engine::exec");
DBUG_ENTER("subselect_indexsubquery_engine");
int error;
bool null_finding= 0;
TABLE *table= tab->table;
@@ -3181,6 +3184,9 @@ int subselect_indexsubquery_engine::exec()
DBUG_RETURN(0);
}
if (!tab->preread_init_done && tab->preread_init())
DBUG_RETURN(1);
if (null_keypart)
DBUG_RETURN(scan_table());
@@ -3282,10 +3288,13 @@ void subselect_uniquesubquery_engine::exclude()
}
table_map subselect_engine::calc_const_tables(TABLE_LIST *table)
table_map subselect_engine::calc_const_tables(List<TABLE_LIST> &list)
{
table_map map= 0;
for (; table; table= table->next_leaf)
List_iterator<TABLE_LIST> ti(list);
TABLE_LIST *table;
//for (; table; table= table->next_leaf)
while ((table= ti++))
{
TABLE *tbl= table->table;
if (tbl && tbl->const_table)
@@ -3297,14 +3306,13 @@ table_map subselect_engine::calc_const_tables(TABLE_LIST *table)
table_map subselect_single_select_engine::upper_select_const_tables()
{
return calc_const_tables((TABLE_LIST *) select_lex->outer_select()->
leaf_tables);
return calc_const_tables(select_lex->outer_select()->leaf_tables);
}
table_map subselect_union_engine::upper_select_const_tables()
{
return calc_const_tables((TABLE_LIST *) unit->outer_select()->leaf_tables);
return calc_const_tables(unit->outer_select()->leaf_tables);
}
@@ -3835,7 +3843,7 @@ bool subselect_hash_sj_engine::init_permanent(List<Item> *tmp_columns)
if (((select_union*) result)->create_result_table(
thd, tmp_columns, TRUE, tmp_create_options,
"materialized subselect", TRUE))
"materialized subselect", TRUE, TRUE))
DBUG_RETURN(TRUE);
tmp_table= ((select_union*) result)->table;