diff options
| author | unknown <sanja@montyprogram.com> | 2014-01-26 16:41:15 +0200 |
|---|---|---|
| committer | unknown <sanja@montyprogram.com> | 2014-01-26 16:41:15 +0200 |
| commit | 31249744fe88bccee1054398baa532f44a6c2a10 (patch) | |
| tree | d32034bd289b9cc6df07238eb214204f28db02bc /sql/sql_view.cc | |
| parent | c6de45584a40052754ccfa7fc27f59483af51e98 (diff) | |
| parent | d9cb1352c8256d9c19a3d29af6fe3d705578a413 (diff) | |
| download | mariadb-git-31249744fe88bccee1054398baa532f44a6c2a10.tar.gz | |
merge 5.3->5.5
Diffstat (limited to 'sql/sql_view.cc')
| -rw-r--r-- | sql/sql_view.cc | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/sql/sql_view.cc b/sql/sql_view.cc index 52872e8ea5b..74e80cdebfd 100644 --- a/sql/sql_view.cc +++ b/sql/sql_view.cc @@ -1138,11 +1138,7 @@ bool mysql_make_view(THD *thd, File_parser *parser, TABLE_LIST *table, will be TRUE as far as we make new table cache). */ old_lex= thd->lex; - arena= thd->stmt_arena; - if (arena->is_conventional()) - arena= 0; - else - thd->set_n_backup_active_arena(arena, &backup); + arena= thd->activate_stmt_arena_if_needed(&backup); /* init timestamp */ if (!table->timestamp.str) |