diff options
| author | Sergei Petrunia <psergey@askmonty.org> | 2015-04-12 04:59:34 +0300 |
|---|---|---|
| committer | Sergei Petrunia <psergey@askmonty.org> | 2015-04-12 04:59:34 +0300 |
| commit | 0719df781e5600bceeaaec0e97367f4420a491d0 (patch) | |
| tree | 50fd2015cc044edfbf9e64fccfd16d9b5ce1aa18 /sql/sql_update.cc | |
| parent | 4938b822634b173c0d7ef882f721b553b223fadd (diff) | |
| parent | 37e87b587396319e607fb8626b6f2a74e66d25a4 (diff) | |
| download | mariadb-git-0719df781e5600bceeaaec0e97367f4420a491d0.tar.gz | |
Merge
Diffstat (limited to 'sql/sql_update.cc')
| -rw-r--r-- | sql/sql_update.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_update.cc b/sql/sql_update.cc index cf6a0f0f140..830d26fd62e 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -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); |