1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00

Merge branch '10.10' into 10.11

This commit is contained in:
Oleksandr Byelkin
2023-11-08 16:46:47 +01:00
560 changed files with 13069 additions and 8461 deletions

View File

@@ -2026,6 +2026,11 @@ void Explain_table_access::print_explain_json(Explain_query *query,
writer->add_member("r_unpack_time_ms");
writer->add_double(jbuf_unpack_tracker.get_time_ms());
DBUG_EXECUTE_IF("analyze_print_r_unpack_ops",
{
writer->add_member("r_unpack_ops");
writer->add_ull(jbuf_unpack_tracker.get_loops());
});
writer->add_member("r_other_time_ms").
add_double(jbuf_extra_time_tracker.get_time_ms());