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/mysql-5.0-runtime
This commit is contained in:
thek@adventure.(none)
2007-11-21 10:02:44 +01:00
parent 7491e15f21 1794242b24
commit 0b38e67453
7 changed files with 168 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_base.cc
View File

@ -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: