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

Fix to compile with msvc: converted static const int Item_arena::* to enum members, undefine ERROR

Browse Source 
include/config-win.h:
  Undefine ERROR #defined by WINGDI
sql/sql_class.cc:
  Fix to compile with msvc: converted static const int Item_arena::* to enum members
sql/sql_class.h:
  Fix to compile with msvc: converted static const int Item_arena::* to enum members
sql/sql_prepare.cc:
  Fix to compile with msvc: converted static const int Item_arena::* to enum members
This commit is contained in:
unknown
2004-08-24 14:44:15 +04:00
parent 1ffda90b83
commit d261072f7c
4 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_class.cc
View File

@@ -1303,7 +1303,7 @@ int select_dumpvar::prepare(List<Item> &list, SELECT_LEX_UNIT *u)
Item_arena::Item_arena(THD* thd)
:free_list(0),
state(INITIALIZED)
state((int)INITIALIZED)
{
init_sql_alloc(&mem_root,
thd->variables.query_alloc_block_size,
@@ -1315,7 +1315,7 @@ Item_arena::Item_arena(THD* thd)
Item_arena::Item_arena()
:free_list(0),
state(CONVENTIONAL_EXECUTION)
state((int)CONVENTIONAL_EXECUTION)
{
clear_alloc_root(&mem_root);
}
@@ -1323,7 +1323,7 @@ Item_arena::Item_arena()
Item_arena::Item_arena(bool init_mem_root)
:free_list(0),
state(INITIALIZED)
state((int)INITIALIZED)
{
if (init_mem_root)
clear_alloc_root(&mem_root);