summaryrefslogtreecommitdiff
path: root/sql/sql_class.cc
diff options
context:
space:
mode:
authorSergey Petrunya <psergey@askmonty.org>2012-06-25 18:39:26 +0400
committerSergey Petrunya <psergey@askmonty.org>2012-06-25 18:39:26 +0400
commit66c62de1034e780144e6945b3a2150253e2a652c (patch)
treee5b54ec2a781797b4bc058c05141f1ada7e40844 /sql/sql_class.cc
parent45503698c13c55a6c21e02f4422bd3a4bcb02fd9 (diff)
downloadmariadb-git-66c62de1034e780144e6945b3a2150253e2a652c.tar.gz
MWL#182: Explain running statements
- Remove out-of-date comments, add dbug assertions.
Diffstat (limited to 'sql/sql_class.cc')
-rw-r--r--sql/sql_class.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc
index d694afebc2c..5408b10c6b1 100644
--- a/sql/sql_class.cc
+++ b/sql/sql_class.cc
@@ -3333,12 +3333,14 @@ void THD::restore_active_arena(Query_arena *set, Query_arena *backup)
void Show_explain_request::get_explain_data(void *arg)
{
Show_explain_request *req= (Show_explain_request*)arg;
- //TODO: change mem_root to point to request_thd->mem_root.
- // Actually, change the ARENA, because we're going to allocate items!
Query_arena backup_arena;
THD *target_thd= req->target_thd;
bool printed_anything= FALSE;
+ /*
+ Change the arena because JOIN::print_explain and co. are going to allocate
+ items. Let them allocate them on our arena.
+ */
target_thd->set_n_backup_active_arena((Query_arena*)req->request_thd,
&backup_arena);