database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge adventure.(none):/home/thek/Development/cpp/bug31153/my50-bug31153

Browse Source 
into  adventure.(none):/home/thek/Development/cpp/bug31153/my51-bug31153
This commit is contained in:
thek@adventure.(none)
2007-11-21 11:25:17 +01:00
parent 53b0324824 1794242b24
commit 7580f9043a
6 changed files with 49 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_base.cc
View File

@ -86,7 +86,6 @@ bool Prelock_error_handler::safely_trapped_errors()
@defgroup Data_Dictionary Data Dictionary
@{
*/
TABLE *unused_tables; /* Used by mysql_test */
HASH open_cache; /* Used by mysql_test */
static HASH table_def_cache;
@ -3502,7 +3501,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: