mirror of
https://github.com/MariaDB/server.git
synced 2026-05-07 15:45:33 +02:00
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
This commit is contained in:
parent
47a5ac0e30
commit
db67626196
19 changed files with 91 additions and 101 deletions
|
|
@ -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
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue