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

Merge branch '11.2' into 11.3

Browse Source
This commit is contained in:
Sergei Golubchik
2023-09-30 14:12:12 +02:00
parent 905c3d61e1 872ed5342d
commit 3928c7e29a
112 changed files with 2921 additions and 618 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sql/sql_lex.cc
View File

@@ -5817,7 +5817,6 @@ int LEX::print_explain(select_result_sink *output, uint8 explain_flags,
query_time_in_progress_ms=
(now - start_time) / (HRTIME_RESOLUTION / 1000);
res= explain->print_explain_json(output, is_analyze,
true /* is_show_cmd */,
query_time_in_progress_ms);
}
else