MDEV-23766: Fix fix_semijoin_strategies_for_picked_join_order by assert

1f1ee085 · Sergei Krivonos · Sergei Krivonos · 47ab793d · 1f1ee085
Commit 1f1ee085 authored Oct 29, 2021 by Sergei Krivonos Committed by Sergei Krivonos Nov 09, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

sql/opt_subselect.cc sql/opt_subselect.cc +3 -3

No files found.
--- a/sql/opt_subselect.cc
+++ b/sql/opt_subselect.cc
@@ -3819,9 +3819,9 @@ void fix_semijoin_strategies_for_picked_join_order(JOIN *join)
      Json_writer_array semijoin_plan(thd, "join_order");
      for (i= first + sjm->tables; i <= tablenr; i++)
      {
+        Json_writer_object trace_one_table(thd);
        if (unlikely(thd->trace_started()))
        {
-          Json_writer_object trace_one_table(thd);
          trace_one_table.add_table_name(join->best_positions[i].table);
        }
        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");
      for (idx= first; idx <= tablenr; idx++)
      {
+        Json_writer_object trace_one_table(thd);
        if (unlikely(thd->trace_started()))
        {
-          Json_writer_object trace_one_table(thd);
          trace_one_table.add_table_name(join->best_positions[idx].table);
        }
        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");
      for (idx= first; idx <= tablenr; idx++)
      {
+        Json_writer_object trace_one_table(thd);
        if (unlikely(thd->trace_started()))
        {
-          Json_writer_object trace_one_table(thd);
          trace_one_table.add_table_name(join->best_positions[idx].table);
        }
        if (join->best_positions[idx].use_join_buffer || (idx == first))