database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

MDEV-23766: Fix fix_semijoin_strategies_for_picked_join_order by assert

Browse Source
This commit is contained in:
Sergei Krivonos
2021-10-29 01:32:21 +03:00
committed by Sergei Krivonos
parent 47ab793d71
commit 1f1ee085fb
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/opt_subselect.cc
View File

@@ -3819,9 +3819,9 @@ void fix_semijoin_strategies_for_picked_join_order(JOIN *join)
Json_writer_array semijoin_plan(thd, "join_order"); Json_writer_array semijoin_plan(thd, "join_order");
for (i= first + sjm->tables; i <= tablenr; i++) for (i= first + sjm->tables; i <= tablenr; i++)
{ {
Json_writer_object trace_one_table(thd);
if (unlikely(thd->trace_started())) if (unlikely(thd->trace_started()))
{ {
Json_writer_object trace_one_table(thd);
trace_one_table.add_table_name(join->best_positions[i].table); trace_one_table.add_table_name(join->best_positions[i].table);
} }
best_access_path(join, join->best_positions[i].table, rem_tables, best_access_path(join, join->best_positions[i].table, rem_tables,
@@ -3858,9 +3858,9 @@ void fix_semijoin_strategies_for_picked_join_order(JOIN *join)
Json_writer_array semijoin_plan(thd, "join_order"); Json_writer_array semijoin_plan(thd, "join_order");
for (idx= first; idx <= tablenr; idx++) for (idx= first; idx <= tablenr; idx++)
{ {
Json_writer_object trace_one_table(thd);
if (unlikely(thd->trace_started())) if (unlikely(thd->trace_started()))
{ {
Json_writer_object trace_one_table(thd);
trace_one_table.add_table_name(join->best_positions[idx].table); trace_one_table.add_table_name(join->best_positions[idx].table);
} }
if (join->best_positions[idx].use_join_buffer) if (join->best_positions[idx].use_join_buffer)
@@ -3897,9 +3897,9 @@ void fix_semijoin_strategies_for_picked_join_order(JOIN *join)
Json_writer_array semijoin_plan(thd, "join_order"); Json_writer_array semijoin_plan(thd, "join_order");
for (idx= first; idx <= tablenr; idx++) for (idx= first; idx <= tablenr; idx++)
{ {
Json_writer_object trace_one_table(thd);
if (unlikely(thd->trace_started())) if (unlikely(thd->trace_started()))
{ {
Json_writer_object trace_one_table(thd);
trace_one_table.add_table_name(join->best_positions[idx].table); trace_one_table.add_table_name(join->best_positions[idx].table);
} }
if (join->best_positions[idx].use_join_buffer || (idx == first)) if (join->best_positions[idx].use_join_buffer || (idx == first))