diff options
| author | Igor Babaev <igor@askmonty.org> | 2012-12-16 16:49:19 -0800 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2012-12-16 16:49:19 -0800 |
| commit | 7760efad74140680b1eefaf2172b0fa26f7b1146 (patch) | |
| tree | 57742baa180206a1cd3ea35d38c58108accd22a9 /sql/sql_delete.cc | |
| parent | 40bbf697aad7d923fc1bd995bc5f547e45461cbe (diff) | |
| parent | b8b875cb796743240bed71857eae73d37f03c28f (diff) | |
| download | mariadb-git-7760efad74140680b1eefaf2172b0fa26f7b1146.tar.gz | |
Merge mariadb-5.5 -> 10.0-base.
Diffstat (limited to 'sql/sql_delete.cc')
| -rw-r--r-- | sql/sql_delete.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/sql_delete.cc b/sql/sql_delete.cc index 5dff27b2f89..e536ca7a6b4 100644 --- a/sql/sql_delete.cc +++ b/sql/sql_delete.cc @@ -330,7 +330,9 @@ bool mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds, ! thd->is_error()) { 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++; // thd->is_error() is tested to disallow delete row on error if (!select || select->skip_record(thd) > 0) |