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

avoiding of allocating JOIN structure on every UNION executing

Browse Source 
(SCRUM)


sql/sql_select.cc:
  support of fake_select_lex join clean
  removed compiler warning
sql/sql_select.h:
  JOIN clean for fake_select_lex
sql/sql_union.cc:
  avoiding of allocating JOIN structure on every UNION executing
This commit is contained in:
unknown
2003-07-05 17:21:39 +03:00
parent 01eb6a4a22
commit a6943f9988
3 changed files with 93 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
sql/sql_select.cc
View File

@ -1381,12 +1381,24 @@ mysql_select(THD *thd, Item ***rref_pointer_array,
JOIN *join;
if (select_lex->join != 0)
{
//here is EXPLAIN of subselect or derived table
join= select_lex->join;
join->result= result;
if (!join->procedure && result->prepare(join->fields_list, unit))
if (select_lex->linkage != GLOBAL_OPTIONS_TYPE)
{
DBUG_RETURN(-1);
//here is EXPLAIN of subselect or derived table
join->result= result;
if (!join->procedure && result->prepare(join->fields_list, unit))
{
DBUG_RETURN(-1);
}
}
else
{
if (join->prepare(rref_pointer_array, tables, wild_num,
conds, og_num, order, group, having, proc_param,
select_lex, unit, tables_and_fields_initied))
{
DBUG_RETURN(-1);
}
}
join->select_options= select_options;
free_join= 0;
@ -1396,7 +1408,6 @@ mysql_select(THD *thd, Item ***rref_pointer_array,
join= new JOIN(thd, fields, select_options, result);
thd->proc_info="init";
thd->used_tables=0; // Updated by setup_fields
if (join->prepare(rref_pointer_array, tables, wild_num,
conds, og_num, order, group, having, proc_param,
select_lex, unit, tables_and_fields_initied))
@ -4300,6 +4311,7 @@ Field *create_tmp_field(THD *thd, TABLE *table,Item *item, Item::Type type,
default:
// This case should never be choosen
DBUG_ASSERT(0);
new_field= 0; // to satisfy compiler (uninitialized variable)
break;
}
if (copy_func && item->is_result_field())