diff options
| author | unknown <malff@lambda.hsd1.co.comcast.net.> | 2007-11-21 18:35:02 -0700 |
|---|---|---|
| committer | unknown <malff@lambda.hsd1.co.comcast.net.> | 2007-11-21 18:35:02 -0700 |
| commit | a11256f49ad62a54047b7e22d9f2adf57fc1f094 (patch) | |
| tree | 5f920b03a54cfb73ccd21059d3cdf2bd4ef48806 /sql/sql_base.cc | |
| parent | 787316f23567e1b7d11bf1e2978c109a23b6f36a (diff) | |
| parent | 1ae0237f24c5f207e30bb29945fbb55f87192722 (diff) | |
| download | mariadb-git-a11256f49ad62a54047b7e22d9f2adf57fc1f094.tar.gz | |
Merge lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.0-base
into lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.0-rt-merge
sql/mysqld.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
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 fd921be1ecf..e79e4db31d2 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: |