database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-03 05:41:09 +03:00
Code Activity

Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1

Browse Source 
into mysql.com:/dbdata/psergey/mysql-4.1-bug-psnames


sql/sql_class.cc:
  Auto merged
This commit is contained in:
unknown
2004-08-31 14:12:42 +04:00
parent 02d3c02281 c62dd0d409
commit d2baf0f12b
22 changed files with 309 additions and 265 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_class.cc
View File

@@ -1323,7 +1323,7 @@ void select_dumpvar::cleanup()
Item_arena::Item_arena(THD* thd)
:free_list(0),
state((int)INITIALIZED)
state(INITIALIZED)
{
init_sql_alloc(&mem_root,
thd->variables.query_alloc_block_size,
@@ -1335,7 +1335,7 @@ Item_arena::Item_arena(THD* thd)
Item_arena::Item_arena()
:free_list(0),
state((int)CONVENTIONAL_EXECUTION)
state(CONVENTIONAL_EXECUTION)
{
clear_alloc_root(&mem_root);
}
@@ -1343,7 +1343,7 @@ Item_arena::Item_arena()
Item_arena::Item_arena(bool init_mem_root)
:free_list(0),
state((int)INITIALIZED)
state(INITIALIZED)
{
if (init_mem_root)
clear_alloc_root(&mem_root);