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 10.11 into 11.0

Browse Source
This commit is contained in:
Marko Mäkelä
2023-04-27 15:11:18 +03:00
parent 54819192fe 7b17e0d4ac
commit aa6ba99310
31 changed files with 646 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
sql/item.h
View File

@@ -7828,7 +7828,7 @@ public:
Item *get_tmp_table_item(THD *thd)
{ return m_item->get_tmp_table_item(thd); }
Item *get_copy(THD *thd)
{ return m_item->get_copy(thd); }
{ return get_item_copy<Item_direct_ref_to_item>(thd, this); }
COND *build_equal_items(THD *thd, COND_EQUAL *inherited,
bool link_item_fields,
COND_EQUAL **cond_equal_ref)
@@ -7896,7 +7896,20 @@ public:
bool excl_dep_on_grouping_fields(st_select_lex *sel)
{ return m_item->excl_dep_on_grouping_fields(sel); }
bool is_expensive() { return m_item->is_expensive(); }
Item* build_clone(THD *thd) { return get_copy(thd); }
void set_item(Item *item) { m_item= item; }
Item *build_clone(THD *thd)
{
Item *clone_item= m_item->build_clone(thd);
if (clone_item)
{
Item_direct_ref_to_item *copy= (Item_direct_ref_to_item *) get_copy(thd);
if (!copy)
return 0;
copy->set_item(clone_item);
return copy;
}
return 0;
}
void split_sum_func(THD *thd, Ref_ptr_array ref_pointer_array,
List<Item> &fields, uint flags)