diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-11-22 10:19:31 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-11-22 10:19:31 +0100 |
| commit | a48a91d90f07798deebe514d9d827fb719da7294 (patch) | |
| tree | c438c045be1f3d8167b3746aa3ac87f848902aeb /sql/sql_delete.cc | |
| parent | 3a1fdc9e7fc65e29320b988f9a69c8acab168ff9 (diff) | |
| parent | 13ba0dd286f3296bfbbd202fa76d47770734b472 (diff) | |
| download | mariadb-git-a48a91d90f07798deebe514d9d827fb719da7294.tar.gz | |
5.3->5.5 merge
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 81e3dca50ae..3c245807b47 100644 --- a/sql/sql_delete.cc +++ b/sql/sql_delete.cc @@ -328,7 +328,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) |