database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-10-23 18:49:29 +03:00
Code Activity

Remove JOIN::original_join_tab, original_table_count

Browse Source 
These were added by cf50e13fbd (MDEV-6080: Allowing storage engine to
shortcut group by queries) to remember the join_tab array and table_count
before the group_by_handler replaced them.

The last assignment of non-NULL values to them was removed by:
commit 2cfc450bf7
Author: Igor Babaev <igor@askmonty.org>
Date:   Tue Feb 9 2016

    This is the consolidated patch for mdev-8646: "Re-factor the code
    for post-join operations".

Since then original_join_tab was only set to 0, so the block in
JOIN::cleanup() that restored join_tab and table_count from them never
ran. Remove the block and both members.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
This commit is contained in:
Sergei Petrunia
2026-10-23 14:48:26 +03:00
parent bf98d56dd5
commit 1e3d5ea61f
2 changed files with 0 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sql/sql_select.cc
View File

@@ -559,7 +559,6 @@ void JOIN::init(THD *thd_arg, List<Item> &fields_arg,
no_rows_in_result_called= 0;
positions= best_positions= 0;
pushdown_query= 0;
original_join_tab= 0;
explain= NULL;
tmp_table_keep_current_rowid= 0;
allowed_top_level_tables= 0;
@@ -17586,14 +17585,6 @@ void JOIN::cleanup(bool full)
if (full)
have_query_plan= QEP_DELETED;
if (original_join_tab)
{
/* Free the original optimized join created for the group_by_handler */
join_tab= original_join_tab;
original_join_tab= 0;
table_count= original_table_count;
}
if (join_tab)
{
JOIN_TAB *tab;

2
sql/sql_select.h
View File

@@ -1711,8 +1711,6 @@ public:
POSITION *next_sort_position; /* Next free space in sort_positions */
Pushdown_query *pushdown_query;
JOIN_TAB *original_join_tab;
uint original_table_count;
uint sort_space;
/******* Join optimization state members start *******/