database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge remote-tracking branch '10.4' into 10.5

Browse Source
This commit is contained in:
Oleksandr Byelkin
2023-03-31 21:32:41 +02:00
parent e093e5abbe eaebe8b560
commit ac5a534a4c
306 changed files with 10920 additions and 6615 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
sql/sql_explain.cc
View File

@ -161,7 +161,7 @@ void Explain_query::query_plan_ready()
Send EXPLAIN output to the client.
*/
int Explain_query::send_explain(THD *thd)
int Explain_query::send_explain(THD *thd, bool extended)
{
select_result *result;
LEX *lex= thd->lex;
@ -174,8 +174,22 @@ int Explain_query::send_explain(THD *thd)
if (thd->lex->explain_json)
print_explain_json(result, thd->lex->analyze_stmt);
else
{
res= print_explain(result, lex->describe, thd->lex->analyze_stmt);
if (extended)
{
char buff[1024];
String str(buff,(uint32) sizeof(buff), system_charset_info);
str.length(0);
/*
The warnings system requires input in utf8, @see
mysqld_show_warnings().
*/
lex->unit.print(&str, QT_EXPLAIN_EXTENDED);
push_warning(thd, Sql_condition::WARN_LEVEL_NOTE,
ER_YES, str.c_ptr_safe());
}
}
if (res)
result->abort_result_set();
else
@ -185,6 +199,7 @@ int Explain_query::send_explain(THD *thd)
}
/*
The main entry point to print EXPLAIN of the entire query
*/