database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-14 13:41:20 +03:00
Code Activity

changes based on partial revie of task 577 (SCRUM)

Browse Source 
sql/item.cc:
  Fixed Item usual constructor to call current_thd only once.
  Fixed copy constructor to receive THD pointer via arguments.
  added comments
  removed counter-1 and unnessesary initializaton of counter
sql/item.h:
  Fixed copy constructor to receive THD pointer via arguments.
  Renamed get_same to copy_or_same.
  THD pointetr added to copy_or_same and get_tmp_table_item.
sql/item_cmpfunc.cc:
  fixed layout
  fixed direct call of destructor
sql/item_func.cc:
  fiex layout
  THD pointetr added to get_tmp_table_item.
sql/item_func.h:
  THD pointetr added to get_tmp_table_item.
sql/item_sum.cc:
  Fixed copy constructor to receive THD pointer via arguments.
  Renamed get_same to copy_or_same.
  THD pointetr added to copy_or_same and get_tmp_table_item.
sql/item_sum.h:
  fixed layout
  Fixed copy constructor to receive THD pointer via arguments.
  Renamed get_same to copy_or_same.
  THD pointetr added to copy_or_same and get_tmp_table_item.
sql/item_uniq.h:
  Fixed copy constructor to receive THD pointer via arguments.
  Renamed get_same to copy_or_same.
  THD pointetr added to copy_or_same and get_tmp_table_item.
sql/sql_base.cc:
  count from 0
sql/sql_select.cc:
  removed counter-1 and unnessesary initializaton of counter
  THD pointetr added to get_tmp_table_item and change_to_use_tmp_fields.
This commit is contained in:
unknown
2003-01-30 18:07:39 +02:00
parent a0ddb72d52
commit 43b99e58c5
10 changed files with 149 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
sql/sql_select.cc
View File

@ -140,7 +140,7 @@ static void calc_group_buffer(JOIN *join,ORDER *group);
static bool alloc_group_fields(JOIN *join,ORDER *group);
static bool make_sum_func_list(JOIN *join,List<Item> &fields);
// Create list for using with tempory table
static bool change_to_use_tmp_fields(Item **ref_pointer_array,
static bool change_to_use_tmp_fields(THD *thd, Item **ref_pointer_array,
List<Item> &new_list1,
List<Item> &new_list2,
uint elements, List<Item> &items);
@ -968,7 +968,7 @@ JOIN::exec()
items1= items0 + all_fields.elements;
if (sort_and_group || curr_tmp_table->group)
{
if (change_to_use_tmp_fields(items1,
if (change_to_use_tmp_fields(thd, items1,
tmp_fields_list1, tmp_all_fields1,
fields_list.elements, all_fields))
DBUG_VOID_RETURN;
@ -1088,7 +1088,7 @@ JOIN::exec()
if (!items2)
{
items2= items1 + all_fields.elements;
if (change_to_use_tmp_fields(items2,
if (change_to_use_tmp_fields(thd, items2,
tmp_fields_list2, tmp_all_fields2,
fields_list.elements, tmp_all_fields1))
DBUG_VOID_RETURN;
@ -7069,12 +7069,12 @@ find_order_in_list(THD *thd, Item **ref_pointer_array,
order->in_field_list= 1;
return 0;
}
uint counter= 0;
uint counter;
Item **item= find_item_in_list(*order->item, fields, &counter,
IGNORE_ERRORS);
if (item)
{
order->item= ref_pointer_array + counter-1;
order->item= ref_pointer_array + counter;
order->in_field_list=1;
return 0;
}
@ -7192,7 +7192,7 @@ setup_new_fields(THD *thd,TABLE_LIST *tables,List<Item> &fields,
DBUG_ENTER("setup_new_fields");
thd->set_query_id=1; // Not really needed, but...
uint counter= 0;
uint counter;
for (; new_field ; new_field= new_field->next)
{
if ((item= find_item_in_list(*new_field->item, fields, &counter,
@ -7471,7 +7471,7 @@ setup_copy_fields(THD *thd, TMP_TABLE_PARAM *param,
if (pos->type() == Item::FIELD_ITEM)
{
Item_field *item;
if (!(item= new Item_field(*((Item_field*) pos))))
if (!(item= new Item_field(thd, *((Item_field*) pos))))
goto err;
pos= item;
if (item->field->flags & BLOB_FLAG)
@ -7590,7 +7590,7 @@ make_sum_func_list(JOIN *join,List<Item> &fields)
*/
static bool
change_to_use_tmp_fields(Item **ref_pointer_array,
change_to_use_tmp_fields(THD *thd, Item **ref_pointer_array,
List<Item> &new_list1, List<Item> &new_list2,
uint elements, List<Item> &items)
{
@ -7609,7 +7609,7 @@ change_to_use_tmp_fields(Item **ref_pointer_array,
else
if (item->type() == Item::FIELD_ITEM)
{
item_field= item->get_tmp_table_item();
item_field= item->get_tmp_table_item(thd);
}
else if ((field= item->tmp_table_field()))
{
@ -7665,7 +7665,7 @@ change_refs_to_tmp_fields(THD *thd, Item **ref_pointer_array,
uint i, border= items.elements - elements;
for (i= 0; (item= it++); i++)
{
new_list2.push_back(new_item= item->get_tmp_table_item());
new_list2.push_back(new_item= item->get_tmp_table_item(thd));
ref_pointer_array[((i < border)? items.elements-i-1 : i-border)]=
new_item;
}