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 10.6 into 10.11

Browse Source
This commit is contained in:
Marko Mäkelä
2024-05-30 16:04:00 +03:00
parent a960e95feb 5ba542e9ee
commit 22ba7e4ff8
111 changed files with 1451 additions and 296 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/sql_explain.cc
View File

@@ -234,6 +234,9 @@ int Explain_query::send_explain(THD *thd, bool extended)
int Explain_query::print_explain(select_result_sink *output,
uint8 explain_flags, bool is_analyze)
{
/* A sanity check for ANALYZE: */
DBUG_ASSERT(timer_tracker_frequency() != 0.0);
if (upd_del_plan)
{
upd_del_plan->print_explain(this, output, explain_flags, is_analyze);
@@ -1812,7 +1815,7 @@ static void trace_engine_stats(handler *file, Json_writer *writer)
writer->add_member("pages_read_count").add_ull(hs->pages_read_count);
if (hs->pages_read_time)
writer->add_member("pages_read_time_ms").
add_double(hs->pages_read_time / 1000.0);
add_double(hs->pages_read_time * 1000. / timer_tracker_frequency());
if (hs->undo_records_read)
writer->add_member("old_rows_read").add_ull(hs->undo_records_read);
writer->end_object();