diff options
| author | unknown <konstantin@mysql.com> | 2005-06-22 11:59:13 +0400 |
|---|---|---|
| committer | unknown <konstantin@mysql.com> | 2005-06-22 11:59:13 +0400 |
| commit | 40f0738b9c70be6c2c7419b7de0c35f895906ae1 (patch) | |
| tree | 702b9de106d4c975641e3135e14a935a1938fa72 /sql/sp_head.h | |
| parent | 04f6f63dd8bdcb4e0d5e7cc6b2200a87eff037fe (diff) | |
| download | mariadb-git-40f0738b9c70be6c2c7419b7de0c35f895906ae1.tar.gz | |
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.
Diffstat (limited to 'sql/sp_head.h')
| -rw-r--r-- | sql/sp_head.h | 1 |
1 files changed, 1 insertions, 0 deletions
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 |