diff options
| author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-01-16 03:18:14 +0200 |
|---|---|---|
| committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-01-16 03:18:14 +0200 |
| commit | 8e15768731c52b6bbb29d7bfe27bdd71c025a3a3 (patch) | |
| tree | 3148e77619dba81f92ab25d604079b46689e58b8 /sql/sql_update.cc | |
| parent | ebb8c9fb26f86cff8c0d81bd2415f415cef952bb (diff) | |
| parent | 66744f4540c464413055a79111c34449e8381618 (diff) | |
| download | mariadb-git-8e15768731c52b6bbb29d7bfe27bdd71c025a3a3.tar.gz | |
Merge branch '10.0' into 10.1
Diffstat (limited to 'sql/sql_update.cc')
| -rw-r--r-- | sql/sql_update.cc | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/sql/sql_update.cc b/sql/sql_update.cc index 04aea060543..5ccc2384b84 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -640,9 +640,7 @@ int mysql_update(THD *thd, { explain->buf_tracker.on_record_read(); if (table->vfield) - update_virtual_fields(thd, table, - table->triggers ? VCOL_UPDATE_ALL : - VCOL_UPDATE_FOR_READ); + update_virtual_fields(thd, table, VCOL_UPDATE_FOR_READ); thd->inc_examined_row_count(1); if (!select || (error= select->skip_record(thd)) > 0) { @@ -758,9 +756,7 @@ int mysql_update(THD *thd, { explain->tracker.on_record_read(); if (table->vfield) - update_virtual_fields(thd, table, - table->triggers ? VCOL_UPDATE_ALL : - VCOL_UPDATE_FOR_READ); + update_virtual_fields(thd, table, VCOL_UPDATE_FOR_READ); thd->inc_examined_row_count(1); if (!select || select->skip_record(thd) > 0) { @@ -2437,8 +2433,7 @@ int multi_update::do_updates() if (table->default_field && (error= table->update_default_fields())) goto err2; if (table->vfield && - update_virtual_fields(thd, table, - (table->triggers ? VCOL_UPDATE_ALL : VCOL_UPDATE_FOR_WRITE))) + update_virtual_fields(thd, table, VCOL_UPDATE_FOR_WRITE)) goto err2; if ((error= cur_table->view_check_option(thd, ignore)) != VIEW_CHECK_OK) |