mirror of
https://github.com/MariaDB/server.git
synced 2025-07-27 18:02:13 +03:00
changes based on partial revie of task 577 (SCRUM)
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:
@ -1063,7 +1063,8 @@ int in_vector::find(Item *item)
|
||||
}
|
||||
|
||||
in_string::in_string(uint elements,qsort_cmp cmp_func)
|
||||
:in_vector(elements,sizeof(String),cmp_func),tmp(buff,sizeof(buff),default_charset_info)
|
||||
:in_vector(elements, sizeof(String), cmp_func),
|
||||
tmp(buff, sizeof(buff), default_charset_info)
|
||||
{}
|
||||
|
||||
in_string::~in_string()
|
||||
@ -1102,11 +1103,7 @@ in_row::in_row(uint elements, Item * item)
|
||||
in_row::~in_row()
|
||||
{
|
||||
if (base)
|
||||
{
|
||||
cmp_item_row *arr= (cmp_item_row *) base;
|
||||
for (uint i=0 ; i < count ; i++)
|
||||
arr[i].~cmp_item_row();
|
||||
}
|
||||
delete [] (cmp_item_row*) base;
|
||||
}
|
||||
|
||||
byte *in_row::get_value(Item *item)
|
||||
|
Reference in New Issue
Block a user