From 40f0738b9c70be6c2c7419b7de0c35f895906ae1 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 22 Jun 2005 11:59:13 +0400 Subject: Adjust to the changed Query_arena constructor: main_mem_root is moved out of class Query_arena. sql/sp_head.cc: Adjust to the changed Query_arena constructor. main_mem_root is moved out of class Query_arena. sql/sp_head.h: main_mem_root is moved out of class Query_arena: add it to class sp_head. sql/sql_class.cc: main_mem_root is moved out of class Query_arena: remove constructors no longer relevant, remove dead code. sql/sql_class.h: main_mem_root is moved out of class Query_arena. sql/sql_prepare.cc: It's better to not use main_mem_root anywhere: logically, it's not a public member (can't fix sp_head::make_field and Item_subselect::exec to make it protected) sql/sql_select.cc: New Cursor constructor, which avoids unneeded memory allocation when initializign main_mem_root. sql/sql_select.h: main_mem_root is moved out of class Query_arena. --- sql/sp_head.h | 1 + 1 file changed, 1 insertion(+) (limited to 'sql/sp_head.h') diff --git a/sql/sp_head.h b/sql/sp_head.h index d22515672f9..2c75a320f30 100644 --- a/sql/sp_head.h +++ b/sql/sp_head.h @@ -79,6 +79,7 @@ class sp_head :private Query_arena sp_head(const sp_head &); /* Prevent use of these */ void operator=(sp_head &); + MEM_ROOT main_mem_root; public: int m_type; // TYPE_ENUM_FUNCTION or TYPE_ENUM_PROCEDURE -- cgit v1.2.1