1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-05 13:16:09 +03:00

Merge branch '11.0' into 11.1

This commit is contained in:
Sergei Golubchik
2023-09-24 01:46:43 +02:00
82 changed files with 2519 additions and 467 deletions

View File

@@ -5987,8 +5987,7 @@ static bool execute_sqlcom_select(THD *thd, TABLE_LIST *all_tables)
result->remove_offset_limit();
if (lex->explain_json)
{
lex->explain->print_explain_json(result, lex->analyze_stmt,
false /* is_show_cmd */);
lex->explain->print_explain_json(result, lex->analyze_stmt);
}
else
{