summaryrefslogtreecommitdiff
path: root/sql/item_row.h
diff options
context:
space:
mode:
authorIgor Babaev <igor@askmonty.org>2016-02-09 12:35:59 -0800
committerIgor Babaev <igor@askmonty.org>2016-02-09 12:35:59 -0800
commit2cfc450bf78c2d951729d1a0e8f731c0d987b1d5 (patch)
tree6c15f411927c9da723265d5f9891592390e97cea /sql/item_row.h
parent7b50447aa6d051b8d14bb01ef14802cb8ffee223 (diff)
downloadmariadb-git-2cfc450bf78c2d951729d1a0e8f731c0d987b1d5.tar.gz
This is the consolidated patch for mdev-8646:bb-10.2-mdev8646
"Re-factor the code for post-join operations". The patch mainly contains the code ported from mysql-5.6 and created for two essential architectural changes: 1. WL#5558: Resolve ORDER BY execution method at the optimization stage 2. WL#6071: Inline tmp tables into the nested loops algorithm The first task was implemented for mysql-5.6 by Ole John Aske. It allows to make all decisions on ORDER BY operation at the optimization stage. The second task implemented for mysql-5.6 by Evgeny Potemkin adds JOIN_TAB nodes for post-join operations that require temporary tables. It allows to execute these operations within the nested loops algorithm that used to be used before this task only for join queries. Besides these task moves all planning on the execution of these operations from the execution phase to the optimization phase. Some other re-factoring changes of mysql-5.6 were pulled in, mainly because it was easier to pull them in than roll them back. In particular all changes concerning Ref_ptr_array were incorporated. The port required some changes in the MariaDB code that concerned the functionality of EXPLAIN and ANALYZE. This was done mainly by Sergey Petrunia.
Diffstat (limited to 'sql/item_row.h')
-rw-r--r--sql/item_row.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item_row.h b/sql/item_row.h
index bbb9a7f1f96..cb839b60c81 100644
--- a/sql/item_row.h
+++ b/sql/item_row.h
@@ -76,8 +76,8 @@ public:
bool fix_fields(THD *thd, Item **ref);
void fix_after_pullout(st_select_lex *new_parent, Item **ref);
void cleanup();
- void split_sum_func(THD *thd, Item **ref_pointer_array, List<Item> &fields,
- uint flags);
+ void split_sum_func(THD *thd, Ref_ptr_array ref_pointer_array,
+ List<Item> &fields, uint flags);
table_map used_tables() const { return used_tables_cache; };
bool const_item() const { return const_item_cache; };
enum Item_result result_type() const { return ROW_RESULT; }