diff options
| author | unknown <thek@adventure.(none)> | 2007-11-21 10:02:44 +0100 |
|---|---|---|
| committer | unknown <thek@adventure.(none)> | 2007-11-21 10:02:44 +0100 |
| commit | 1ae0237f24c5f207e30bb29945fbb55f87192722 (patch) | |
| tree | 9cc345d443abf70f4e6a97c4ba23463f0e6a5d35 /sql/sql_base.cc | |
| parent | 001c78e29e7a917bad4d64673e84230768d936ad (diff) | |
| parent | bb681dbc883343ed2c503c15833720f8da499317 (diff) | |
| download | mariadb-git-1ae0237f24c5f207e30bb29945fbb55f87192722.tar.gz | |
Merge adventure.(none):/home/thek/Development/cpp/bug31153/my50-bug31153
into adventure.(none):/home/thek/Development/cpp/mysql-5.0-runtime
sql/mysqld.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sp_head.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_yacc.yy:
Manual merge.
Diffstat (limited to 'sql/sql_base.cc')
| -rw-r--r-- | sql/sql_base.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc index b97ba45e18f..1838d0f5850 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -80,7 +80,6 @@ bool Prelock_error_handler::safely_trapped_errors() return ((m_handled_errors > 0) && (m_unhandled_errors == 0)); } - TABLE *unused_tables; /* Used by mysql_test */ HASH open_cache; /* Used by mysql_test */ @@ -2653,7 +2652,7 @@ int open_tables(THD *thd, TABLE_LIST **start, uint *counter, uint flags) temporary mem_root for new .frm parsing. TODO: variables for size */ - init_alloc_root(&new_frm_mem, 8024, 8024); + init_sql_alloc(&new_frm_mem, 8024, 8024); thd->current_tablenr= 0; restart: |