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 10.6 into 10.9

Browse Source
This commit is contained in:
Marko Mäkelä
2023-07-10 11:22:21 +03:00
parent c358e216d9 6ed14bcc06
commit 7cde5c539b
39 changed files with 698 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_update.cc
View File

@ -701,7 +701,7 @@ int mysql_update(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);
@ -1387,7 +1387,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: