diff options
| author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-01-14 19:56:00 +0200 |
|---|---|---|
| committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-01-14 19:59:34 +0200 |
| commit | 66744f4540c464413055a79111c34449e8381618 (patch) | |
| tree | 0905a1b2e47efb1dcd3dde1c9d5187fa45e780dc /sql/sql_delete.cc | |
| parent | 939d1255a78e374f468154f3353e5faa0fa517ca (diff) | |
| parent | 20ca1bcf4bd81ed43683676276b5f27dc8da8e91 (diff) | |
| download | mariadb-git-66744f4540c464413055a79111c34449e8381618.tar.gz | |
Merge branch '5.5' into 10.0
Diffstat (limited to 'sql/sql_delete.cc')
| -rw-r--r-- | sql/sql_delete.cc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sql/sql_delete.cc b/sql/sql_delete.cc index ce7da3cd33a..6b0135d92d9 100644 --- a/sql/sql_delete.cc +++ b/sql/sql_delete.cc @@ -548,9 +548,7 @@ bool mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds, ! thd->is_error()) { 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); // thd->is_error() is tested to disallow delete row on error if (!select || select->skip_record(thd) > 0) @@ -1297,4 +1295,3 @@ bool multi_delete::send_eof() } return 0; } - |