diff options
| author | unknown <sergefp@mysql.com> | 2004-08-24 14:44:15 +0400 |
|---|---|---|
| committer | unknown <sergefp@mysql.com> | 2004-08-24 14:44:15 +0400 |
| commit | d261072f7cdb44869ab8de39fd7a67f0c5122ab5 (patch) | |
| tree | 4fbc65a8bb604088b93c4781dc15692185dad66a /sql/sql_class.cc | |
| parent | 1ffda90b83273cc46869444fc6e7d3c2ebd7f62a (diff) | |
| download | mariadb-git-d261072f7cdb44869ab8de39fd7a67f0c5122ab5.tar.gz | |
Fix to compile with msvc: converted static const int Item_arena::* to enum members, undefine ERROR
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
Diffstat (limited to 'sql/sql_class.cc')
| -rw-r--r-- | sql/sql_class.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index 23fef44c964..ff7dc805119 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -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); |