diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2014-12-03 11:37:26 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2014-12-03 11:37:26 +0100 |
| commit | ec4137c62b00a2bad91dd108f5782b206fe86a8b (patch) | |
| tree | b284d929d1a498df14aafffd0c31831f2b4e9fd5 /sql/sql_update.cc | |
| parent | 1caee393076dc642a7d8e1283377b59ef8f52dbd (diff) | |
| parent | bafe529af76a915f43dbf6a3fb8dc610a4ea121b (diff) | |
| download | mariadb-git-ec4137c62b00a2bad91dd108f5782b206fe86a8b.tar.gz | |
Merge branch '10.1' into bb-10.1-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 b81caea00bc..a3e2b1e23a5 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; - query_plan.save_explain_data(thd->lex->explain); + query_plan.save_explain_data(thd->mem_root, thd->lex->explain); DBUG_EXECUTE_IF("show_explain_probe_update_exec_start", dbug_serve_apcs(thd, 1);); @@ -1042,7 +1042,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_data(thd->lex->explain); + query_plan.save_explain_data(thd->mem_root, thd->lex->explain); emit_explain_and_leave: int err2= thd->lex->explain->send_explain(thd); |