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

Remove calls to current_thd() in Item functions

Browse Source 
- Added THD argument to functions that calls current_thd() or
  new without a mem_root argument:
  make_same(), set_comparator_func(), set_cmp_func(), set_cmp_func*(),
  set_aggregator() and prepare_sum_aggregators()
- Changed "new Class" to "new (thd->mem_root) Class"

Almost all changes mechanical, no logic changes.
This commit is contained in:
Michael Widenius
2020-08-03 13:13:39 +03:00
committed by Sergei Golubchik
parent 3105c9e7a5
commit 9448548481
12 changed files with 184 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
sql/sql_type.cc
View File

@ -4347,46 +4347,54 @@ int Type_handler_int_result::Item_save_in_field(Item *item, Field *field,
/***********************************************************************/
bool Type_handler_row::set_comparator_func(Arg_comparator *cmp) const
bool Type_handler_row::
set_comparator_func(THD *thd, Arg_comparator *cmp) const
{
return cmp->set_cmp_func_row();
return cmp->set_cmp_func_row(thd);
}
bool Type_handler_int_result::set_comparator_func(Arg_comparator *cmp) const
bool Type_handler_int_result::
set_comparator_func(THD *thd, Arg_comparator *cmp) const
{
return cmp->set_cmp_func_int();
return cmp->set_cmp_func_int(thd);
}
bool Type_handler_real_result::set_comparator_func(Arg_comparator *cmp) const
bool Type_handler_real_result::
set_comparator_func(THD *thd, Arg_comparator *cmp) const
{
return cmp->set_cmp_func_real();
return cmp->set_cmp_func_real(thd);
}
bool Type_handler_decimal_result::set_comparator_func(Arg_comparator *cmp) const
bool Type_handler_decimal_result::
set_comparator_func(THD *thd, Arg_comparator *cmp) const
{
return cmp->set_cmp_func_decimal();
return cmp->set_cmp_func_decimal(thd);
}
bool Type_handler_string_result::set_comparator_func(Arg_comparator *cmp) const
bool Type_handler_string_result::
set_comparator_func(THD *thd, Arg_comparator *cmp) const
{
return cmp->set_cmp_func_string();
return cmp->set_cmp_func_string(thd);
}
bool Type_handler_time_common::set_comparator_func(Arg_comparator *cmp) const
bool Type_handler_time_common::
set_comparator_func(THD *thd, Arg_comparator *cmp) const
{
return cmp->set_cmp_func_time();
return cmp->set_cmp_func_time(thd);
}
bool
Type_handler_temporal_with_date::set_comparator_func(Arg_comparator *cmp) const
Type_handler_temporal_with_date::
set_comparator_func(THD *thd, Arg_comparator *cmp) const
{
return cmp->set_cmp_func_datetime();
return cmp->set_cmp_func_datetime(thd);
}
bool
Type_handler_timestamp_common::set_comparator_func(Arg_comparator *cmp) const
Type_handler_timestamp_common::
set_comparator_func(THD *thd, Arg_comparator *cmp) const
{
return cmp->set_cmp_func_native();
return cmp->set_cmp_func_native(thd);
}