diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-30 11:04:27 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-30 11:04:27 +0300 |
| commit | 6da14d7b4a935466de55a6aa87db14bc359dbd30 (patch) | |
| tree | a2d1a73a6bf6bbe0dab2857fd87fa782969412f4 /sql/table.cc | |
| parent | 4783494a5e21939424ecca92bf23d2df65528266 (diff) | |
| parent | 2e1d10ecacc8ccfc0bda8a199c741ee36df981be (diff) | |
| download | mariadb-git-6da14d7b4a935466de55a6aa87db14bc359dbd30.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'sql/table.cc')
| -rw-r--r-- | sql/table.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sql/table.cc b/sql/table.cc index 92dfa59e648..a4de5d9c930 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -8383,9 +8383,10 @@ int TABLE::update_virtual_fields(handler *h, enum_vcol_update_mode update_mode) int TABLE::update_virtual_field(Field *vf) { - DBUG_ASSERT(!in_use->is_error()); - Query_arena backup_arena; DBUG_ENTER("TABLE::update_virtual_field"); + Query_arena backup_arena; + Counting_error_handler count_errors; + in_use->push_internal_handler(&count_errors); in_use->set_n_backup_active_arena(expr_arena, &backup_arena); bitmap_clear_all(&tmp_set); vf->vcol_info->expr->walk(&Item::update_vcol_processor, 0, &tmp_set); @@ -8393,7 +8394,8 @@ int TABLE::update_virtual_field(Field *vf) vf->vcol_info->expr->save_in_field(vf, 0); DBUG_RESTORE_WRITE_SET(vf); in_use->restore_active_arena(expr_arena, &backup_arena); - DBUG_RETURN(in_use->is_error()); + in_use->pop_internal_handler(); + DBUG_RETURN(count_errors.errors); } |