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 '11.8' into 12.0

Browse Source
This commit is contained in:
Oleksandr Byelkin
2025-06-18 07:50:39 +02:00
parent f1102da37a a65f7dc71d
commit dfcb5c91e0
271 changed files with 4921 additions and 1348 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sql/sql_select.cc
View File

@@ -4886,11 +4886,6 @@ int JOIN::exec_inner()
UNION temp table.
*/
Json_writer_object trace_wrapper(thd);
Json_writer_object trace_exec(thd, "join_execution");
trace_exec.add_select_number(select_lex->select_number);
Json_writer_array trace_steps(thd, "steps");
if (!select_lex->outer_select() && // (1)
select_lex != select_lex->master_unit()->fake_select_lex) // (2)
thd->lex->set_limit_rows_examined();
@@ -25399,6 +25394,13 @@ test_if_quick_select(JOIN_TAB *tab)
tab->table->file->ha_index_or_rnd_end();
quick_select_return res;
Json_writer_object wrapper(tab->join->thd);
Json_writer_object range_fer(tab->join->thd,
"range-checked-for-each-record");
range_fer.add_select_number(tab->join->select_lex->select_number);
range_fer.add("loop", tab->join->explain->time_tracker.get_loops());
Json_writer_array rows_est(tab->join->thd, "rows_estimation");
res= tab->select->test_quick_select(tab->join->thd, tab->keys,
(table_map) 0, HA_POS_ERROR, 0,
FALSE, /*remove where parts*/FALSE,