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 branch '10.5' into 10.6

Browse Source
This commit is contained in:
Sergei Golubchik
2024-05-08 20:06:00 +02:00
parent 30d3cfad69 29c185bd77
commit 7b53672c63
360 changed files with 9013 additions and 2214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/opt_split.cc
View File

@@ -1335,6 +1335,7 @@ bool JOIN::fix_all_splittings_in_plan()
{
table_map prev_tables= 0;
table_map all_tables= (table_map(1) << table_count) - 1;
table_map prev_sjm_lookup_tables= 0;
for (uint tablenr= 0; tablenr < table_count; tablenr++)
{
POSITION *cur_pos= &best_positions[tablenr];
@@ -1343,7 +1344,7 @@ bool JOIN::fix_all_splittings_in_plan()
{
SplM_plan_info *spl_plan= cur_pos->spl_plan;
table_map excluded_tables= (all_tables & ~prev_tables) |
sjm_lookup_tables;
prev_sjm_lookup_tables;
;
if (spl_plan)
{
@@ -1361,6 +1362,8 @@ bool JOIN::fix_all_splittings_in_plan()
return true;
}
prev_tables|= tab->table->map;
if (cur_pos->sj_strategy == SJ_OPT_MATERIALIZE)
prev_sjm_lookup_tables|= tab->table->map;
}
return false;
}