diff options
author | Sergei Krivonos <sergei.krivonos@mariadb.com> | 2021-10-29 01:32:21 +0300 |
---|---|---|
committer | Sergei Krivonos <sergei.krivonos@mariadb.com> | 2021-10-29 01:38:18 +0300 |
commit | 4a386f9664ac3e6e34c9415aaa052ecc2999e0ea (patch) | |
tree | ebd150c62bda034b83e2f2ff4f445b4dc6e14d54 | |
parent | 3ec18a23505416c5e0286cc19a8927eeeffa89ce (diff) | |
download | mariadb-git-4a386f9664ac3e6e34c9415aaa052ecc2999e0ea.tar.gz |
MDEV-23766: Fix fix_semijoin_strategies_for_picked_join_order by assert
-rw-r--r-- | sql/opt_subselect.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/opt_subselect.cc b/sql/opt_subselect.cc index dd981a8fdcb..99b6af1ef3c 100644 --- a/sql/opt_subselect.cc +++ b/sql/opt_subselect.cc @@ -3827,9 +3827,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, @@ -3866,9 +3866,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) @@ -3905,9 +3905,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)) |