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

Browse Source
This commit is contained in:
Sergei Petrunia
2015-04-12 04:59:34 +03:00
parent 4938b82263 37e87b5873
commit 0719df781e
16 changed files with 10815 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_update.cc
View File

@ -517,7 +517,7 @@ int mysql_update(THD *thd,
*/
if (thd->lex->describe)
goto produce_explain_and_leave;
explain= query_plan.save_explain_update_data(thd->mem_root, thd);
explain= query_plan.save_explain_update_data(query_plan.mem_root, thd);
ANALYZE_START_TRACKING(&explain->command_tracker);
@ -1052,7 +1052,7 @@ produce_explain_and_leave:
We come here for various "degenerate" query plans: impossible WHERE,
no-partitions-used, impossible-range, etc.
*/
query_plan.save_explain_update_data(thd->mem_root, thd);
query_plan.save_explain_update_data(query_plan.mem_root, thd);
emit_explain_and_leave:
int err2= thd->lex->explain->send_explain(thd);