diff options
| author | Sergei Petrunia <sergey@mariadb.com> | 2023-03-10 18:02:14 +0300 |
|---|---|---|
| committer | Sergei Petrunia <sergey@mariadb.com> | 2023-04-04 12:18:29 +0300 |
| commit | 0269d82d5309c4dc2022ac8dd4d6945699e0ea69 (patch) | |
| tree | cdc81368be46560878bea9f6fb0ba5455a0665f2 /sql/sql_select.cc | |
| parent | 18342cd5e1ba4bd8a9547844e0309f288dc939a4 (diff) | |
| download | mariadb-git-0269d82d5309c4dc2022ac8dd4d6945699e0ea69.tar.gz | |
ANALYZE FORMAT=JSON: Backport block-nl-join.r_unpack_time_ms from 11.0 +fix MDEV-30830.
Also fix it to work with hashed join (MDEV-30830).
Reviewed by: Monty <monty@mariadb.org>
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 2889d757e20..4abf9f2fad6 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -27396,6 +27396,7 @@ bool JOIN_TAB::save_explain_data(Explain_table_access *eta, tracker= &eta->tracker; jbuf_tracker= &eta->jbuf_tracker; jbuf_loops_tracker= &eta->jbuf_loops_tracker; + jbuf_unpack_tracker= &eta->jbuf_unpack_tracker; /* Enable the table access time tracker only for "ANALYZE stmt" */ if (thd->lex->analyze_stmt) @@ -28029,7 +28030,8 @@ int JOIN::save_explain_data_intern(Explain_query *output, Explain_table_access *eta= (new (output->mem_root) - Explain_table_access(output->mem_root)); + Explain_table_access(output->mem_root, + thd->lex->analyze_stmt)); if (!eta) DBUG_RETURN(1); |