summaryrefslogtreecommitdiff
path: root/sql/sql_prepare.cc
diff options
context:
space:
mode:
authorSergey Petrunya <psergey@askmonty.org>2013-06-21 13:26:53 +0400
committerSergey Petrunya <psergey@askmonty.org>2013-06-21 13:26:53 +0400
commitaf5e128e50cac8881f7bfca44cc473600abdce86 (patch)
treec3e235b5b5e6bdf5c0fa1e654f707001ee98dec3 /sql/sql_prepare.cc
parentab4a13b2b91e260d8c75a3c41b7ff5c24747cee0 (diff)
downloadmariadb-git-af5e128e50cac8881f7bfca44cc473600abdce86.tar.gz
[SHOW] EXPLAIN UPDATE/DELETE, code re-structuring
- Handle statements inside SPs: = regular statements = SET command, which does not have its own statement. - Handle execution of subquery from range optimizer: allocate subquery QPFs on the same MEM_ROOT as the whole query plan was allocated.
Diffstat (limited to 'sql/sql_prepare.cc')
-rw-r--r--sql/sql_prepare.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc
index d81070b7406..2f62a06f6a4 100644
--- a/sql/sql_prepare.cc
+++ b/sql/sql_prepare.cc
@@ -3927,8 +3927,7 @@ bool Prepared_statement::execute(String *expanded_query, bool open_cursor)
if (! cursor)
cleanup_stmt();
//psergey: TODO the "EXECUTE problem" is here
- delete_qpf_query(thd->lex->query_plan_footprint);
- thd->lex->query_plan_footprint= NULL;
+ delete_qpf_query(thd->lex);
thd->set_statement(&stmt_backup);
thd->stmt_arena= old_stmt_arena;