diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-01-17 20:17:35 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-01-17 20:17:35 +0100 |
| commit | f7d030489d2980c9deb733925515099ec256f6d2 (patch) | |
| tree | 32673a800f903c26be547aa0f752cf4bd93d4923 /sql/table.cc | |
| parent | f797ea7124e906fd3abf311d66101a21dce2d27d (diff) | |
| parent | 6728aae3b34616cc98a7436ff93f318a15949a4b (diff) | |
| download | mariadb-git-mariadb-10.1.21.tar.gz | |
Merge branch '10.0' into 10.1mariadb-10.1.21
Diffstat (limited to 'sql/table.cc')
| -rw-r--r-- | sql/table.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/table.cc b/sql/table.cc index 8f93f8ae286..759a2d05de7 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -6890,7 +6890,9 @@ int update_virtual_fields(THD *thd, TABLE *table, int error __attribute__ ((unused))= 0; DBUG_ASSERT(table && table->vfield); - thd->reset_arena_for_cached_items(table->expr_arena); + Query_arena backup_arena; + thd->set_n_backup_active_arena(table->expr_arena, &backup_arena); + /* Iterate over virtual fields in the table */ for (vfield_ptr= table->vfield; *vfield_ptr; vfield_ptr++) { @@ -6908,7 +6910,7 @@ int update_virtual_fields(THD *thd, TABLE *table, DBUG_PRINT("info", ("field '%s' - skipped", vfield->field_name)); } } - thd->reset_arena_for_cached_items(0); + thd->restore_active_arena(table->expr_arena, &backup_arena); DBUG_RETURN(0); } |