diff options
| author | Guilhem Bichot <guilhem.bichot@oracle.com> | 2011-05-21 10:59:32 +0200 |
|---|---|---|
| committer | Guilhem Bichot <guilhem.bichot@oracle.com> | 2011-05-21 10:59:32 +0200 |
| commit | 27fa7876c8ad9a574bab5ab489a6d369a3d78947 (patch) | |
| tree | 5ec3599cb2beed91477c85d0593eda12939c1c6e /sql/table.cc | |
| parent | 12f651ac9ddfb21187c69ae7a50c72440f7025c8 (diff) | |
| parent | 34d731ef781d379fde668409ce264139d738aa4d (diff) | |
| download | mariadb-git-27fa7876c8ad9a574bab5ab489a6d369a3d78947.tar.gz | |
merge from latest 5.5
Diffstat (limited to 'sql/table.cc')
| -rw-r--r-- | sql/table.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/table.cc b/sql/table.cc index 1ac17d18d8d..351e80627eb 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -1992,7 +1992,8 @@ int open_table_from_share(THD *thd, TABLE_SHARE *share, const char *alias, Query_arena *backup_stmt_arena_ptr= thd->stmt_arena; Query_arena backup_arena; - Query_arena part_func_arena(&outparam->mem_root, Query_arena::INITIALIZED); + Query_arena part_func_arena(&outparam->mem_root, + Query_arena::STMT_INITIALIZED); thd->set_n_backup_active_arena(&part_func_arena, &backup_arena); thd->stmt_arena= &part_func_arena; bool tmp; |