diff options
| author | unknown <monty@mysql.com> | 2004-11-09 03:58:44 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-11-09 03:58:44 +0200 |
| commit | db67626196992923be83c12302d03cad35cf80f9 (patch) | |
| tree | 7557a3bb8550c387349bc97e96a2a76d71c3ee52 /sql/sp_head.h | |
| parent | 47a5ac0e30599ea287fd206d4d21b7c304fd8c80 (diff) | |
| download | mariadb-git-db67626196992923be83c12302d03cad35cf80f9.tar.gz | |
After merge fixes
Added push_back(void *, MEM_ROOT *) to make some list-handling code easier that needs to be allocated in a different mem-root
(Before one had to change thd->mem_root ; push_back(); restore mem_root.
mysql-test/t/range.test:
After merge fixRecR
sql/item_func.cc:
After merge fix
sql/item_sum.cc:
After merge fix
sql/opt_range.cc:
After merge fix
sql/parse_file.cc:
After merge fix
sql/sp.cc:
After merge fix
sql/sp_head.cc:
After merge fix
sql/sp_head.h:
After merge fix
sql/sql_base.cc:
After merge fix
sql/sql_class.h:
After merge fix
sql/sql_list.h:
Added push_back(void *, MEM_ROOT *) to make some list-handling code easier that needs to be allocated in a different mem-root
(Before one had to change thd->mem_root ; push_back(); restore mem_root.
sql/sql_prepare.cc:
After merge fix
sql/sql_select.cc:
After merge fix
sql/sql_table.cc:
After merge fix
Fixed problem with OPTIMIZE on INNODB tables
sql/sql_trigger.cc:
After merge fix
sql/sql_union.cc:
After merge fix
sql/sql_view.cc:
After merge fix
sql/sql_yacc.yy:
After merge fix
sql/table.cc:
After merge fix
Diffstat (limited to 'sql/sp_head.h')
| -rw-r--r-- | sql/sp_head.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sp_head.h b/sql/sp_head.h index 6aa05838291..4bfe1076f65 100644 --- a/sql/sp_head.h +++ b/sql/sp_head.h @@ -231,7 +231,7 @@ public: private: - MEM_ROOT m_thd_root; // Temp. store for thd's mem_root + MEM_ROOT *m_thd_root; // Temp. store for thd's mem_root THD *m_thd; // Set if we have reset mem_root char *m_thd_db; // Original thd->db pointer |