diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-02-17 21:42:57 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-02-17 21:42:57 +0100 |
| commit | a4b271496888e1f8628d0af36309e35293093577 (patch) | |
| tree | 852ea8d9e627728d260bec20602d3aea94e2e156 /sql/sql_update.cc | |
| parent | 09b586546029a7ffc6886b0ab528105ef3fb78eb (diff) | |
| parent | 3eb8b1125f0c4d9373273cc98d7197cf7f5c2ef1 (diff) | |
| download | mariadb-git-a4b271496888e1f8628d0af36309e35293093577.tar.gz | |
Merge branch 'bb-10.0-serg' into 10.0mariadb-10.0.24
Diffstat (limited to 'sql/sql_update.cc')
| -rw-r--r-- | sql/sql_update.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/sql_update.cc b/sql/sql_update.cc index 0f7b28cd9d9..1220c39cf85 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -2394,6 +2394,10 @@ int multi_update::do_updates() int error; 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))) + goto err2; if ((error= cur_table->view_check_option(thd, ignore)) != VIEW_CHECK_OK) { |