diff options
| author | unknown <knielsen@knielsen-hq.org> | 2012-11-20 13:57:49 +0100 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2012-11-20 13:57:49 +0100 |
| commit | ecf04668a2db3d7fc91e421e68eeb5ab25064aa0 (patch) | |
| tree | 67fb1a5b050c913ad21f9c30628ff3ef0fd81f2c /sql/sql_update.cc | |
| parent | dd2d59924e06afb29e36a6dda56f6fb393ef6c6e (diff) | |
| parent | cbae294396429682a22371f23a048dcd0d4c71da (diff) | |
| download | mariadb-git-ecf04668a2db3d7fc91e421e68eeb5ab25064aa0.tar.gz | |
Merge MariaDB 5.2->5.3
Diffstat (limited to 'sql/sql_update.cc')
| -rw-r--r-- | sql/sql_update.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sql/sql_update.cc b/sql/sql_update.cc index 7d6eb62f57d..9d00118f450 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -507,7 +507,9 @@ int mysql_update(THD *thd, while (!(error=info.read_record(&info)) && !thd->killed) { if (table->vfield) - update_virtual_fields(thd, table); + update_virtual_fields(thd, table, + table->triggers ? VCOL_UPDATE_ALL : + VCOL_UPDATE_FOR_READ); thd->examined_row_count++; if (!select || (error= select->skip_record(thd)) > 0) { @@ -623,7 +625,9 @@ int mysql_update(THD *thd, while (!(error=info.read_record(&info)) && !thd->killed) { if (table->vfield) - update_virtual_fields(thd, table); + update_virtual_fields(thd, table, + table->triggers ? VCOL_UPDATE_ALL : + VCOL_UPDATE_FOR_READ); thd->examined_row_count++; if (!select || select->skip_record(thd) > 0) { |