diff options
| author | unknown <sergefp@mysql.com> | 2004-08-31 14:12:42 +0400 |
|---|---|---|
| committer | unknown <sergefp@mysql.com> | 2004-08-31 14:12:42 +0400 |
| commit | d2baf0f12bbd9b63315212afb24c2e4ea9d80eeb (patch) | |
| tree | 9be37fae6adfb6d8924626233277dacfc79d30de /sql/sql_class.cc | |
| parent | 02d3c022814a524a7af8cb2abe0573bb1613ff5d (diff) | |
| parent | c62dd0d409c76fe676e76467675512c275e8da09 (diff) | |
| download | mariadb-git-d2baf0f12bbd9b63315212afb24c2e4ea9d80eeb.tar.gz | |
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/dbdata/psergey/mysql-4.1-bug-psnames
sql/sql_class.cc:
Auto merged
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 c7d8e81d11b..84821cb8748 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -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); |