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/table.cc | |
| parent | c6de45584a40052754ccfa7fc27f59483af51e98 (diff) | |
| parent | d9cb1352c8256d9c19a3d29af6fe3d705578a413 (diff) | |
| download | mariadb-git-31249744fe88bccee1054398baa532f44a6c2a10.tar.gz | |
merge 5.3->5.5
Diffstat (limited to 'sql/table.cc')
| -rw-r--r-- | sql/table.cc | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sql/table.cc b/sql/table.cc index 932ca953c40..bb650130816 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -4087,7 +4087,7 @@ bool TABLE_LIST::create_field_translation(THD *thd) SELECT_LEX *select= get_single_select(); List_iterator_fast<Item> it(select->item_list); uint field_count= 0; - Query_arena *arena= thd->stmt_arena, backup; + Query_arena *arena, backup; bool res= FALSE; DBUG_ENTER("TABLE_LIST::create_field_translation"); @@ -4126,10 +4126,7 @@ bool TABLE_LIST::create_field_translation(THD *thd) DBUG_RETURN(FALSE); } - if (arena->is_conventional()) - arena= 0; // For easier test - else - thd->set_n_backup_active_arena(arena, &backup); + arena= thd->activate_stmt_arena_if_needed(&backup); /* Create view fields translation table */ |