diff options
| author | unknown <bell@sanja.is.com.ua> | 2004-05-25 22:40:37 +0300 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2004-05-25 22:40:37 +0300 |
| commit | e7f108e0542a39d17197480735d7d9a97f9f6098 (patch) | |
| tree | 63064edcec871e803536348ee1366410471142b7 /sql/sp_head.h | |
| parent | 4c09584bbf5947beaed33c8b964cd18c41049e49 (diff) | |
| parent | 16227c28e65ba6355b44f6657d6fc67672f68bac (diff) | |
| download | mariadb-git-e7f108e0542a39d17197480735d7d9a97f9f6098.tar.gz | |
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into sanja.is.com.ua:/home/bell/mysql/bk/work-sp2-5.0
sql/sql_class.h:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'sql/sp_head.h')
| -rw-r--r-- | sql/sp_head.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sql/sp_head.h b/sql/sp_head.h index cb2e56adabe..3906d8c2bc8 100644 --- a/sql/sp_head.h +++ b/sql/sp_head.h @@ -70,7 +70,7 @@ sp_name * sp_name_current_db_new(THD *thd, LEX_STRING name); -class sp_head : public Sql_alloc +class sp_head :private Item_arena { sp_head(const sp_head &); /* Prevent use of these */ void operator=(sp_head &); @@ -206,9 +206,7 @@ public: private: - MEM_ROOT m_mem_root; // My own mem_root MEM_ROOT m_thd_root; // Temp. store for thd's mem_root - Item *m_free_list; // Where the items go THD *m_thd; // Set if we have reset mem_root char *m_thd_db; // Original thd->db pointer |