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

Merge 10.10 into 10.11

Browse Source
This commit is contained in:
Marko Mäkelä
2023-04-14 13:08:28 +03:00
parent 17caff92b5 a009280e60
commit 656c2e18b1
382 changed files with 13277 additions and 7524 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sql/sql_update.cc
View File

@ -1391,7 +1391,8 @@ produce_explain_and_leave:
goto err;
emit_explain_and_leave:
int err2= thd->lex->explain->send_explain(thd);
bool extended= thd->lex->describe & DESCRIBE_EXTENDED;
int err2= thd->lex->explain->send_explain(thd, extended);
delete select;
free_underlaid_joins(thd, select_lex);
@ -1465,6 +1466,8 @@ bool mysql_prepare_update(THD *thd, TABLE_LIST *table_list,
select_lex->fix_prepare_information(thd, conds, &fake_conds);
if (!thd->lex->upd_del_where)
thd->lex->upd_del_where= *conds;
DBUG_RETURN(FALSE);
}
@ -1992,7 +1995,10 @@ bool mysql_multi_update(THD *thd, TABLE_LIST *table_list, List<Item> *fields,
else
{
if (thd->lex->describe || thd->lex->analyze_stmt)
res= thd->lex->explain->send_explain(thd);
{
bool extended= thd->lex->describe & DESCRIBE_EXTENDED;
res= thd->lex->explain->send_explain(thd, extended);
}
}
thd->abort_on_warning= 0;
DBUG_RETURN(res);