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.0' into 11.1

Browse Source
This commit is contained in:
Sergei Golubchik
2023-09-24 01:46:43 +02:00
parent e6ec2b3b52 9880006b5b
commit f031889ae4
82 changed files with 2519 additions and 467 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sql/sql_lex.cc
View File

@@ -5776,7 +5776,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