database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Merge 11.0 into 11.1

Browse Source
This commit is contained in:
Marko Mäkelä
2023-07-26 15:13:43 +03:00
parent 26b96094ec f2b4972bd4
commit c6ac1e39b6
214 changed files with 5163 additions and 2783 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_update.cc
View File

@ -589,7 +589,7 @@ bool Sql_cmd_update::update_single_table(THD *thd)
*/
if (thd->lex->describe)
goto produce_explain_and_leave;
if (!(explain= query_plan.save_explain_update_data(query_plan.mem_root, thd)))
if (!(explain= query_plan.save_explain_update_data(thd, query_plan.mem_root)))
goto err;
ANALYZE_START_TRACKING(thd, &explain->command_tracker);
@ -1275,7 +1275,7 @@ produce_explain_and_leave:
We come here for various "degenerate" query plans: impossible WHERE,
no-partitions-used, impossible-range, etc.
*/
if (unlikely(!query_plan.save_explain_update_data(query_plan.mem_root, thd)))
if (unlikely(!query_plan.save_explain_update_data(thd, query_plan.mem_root)))
goto err;
emit_explain_and_leave: