diff options
| author | Igor Babaev <igor@askmonty.org> | 2012-04-11 20:44:52 -0700 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2012-04-11 20:44:52 -0700 |
| commit | 9e74665a2d91e299d1b9c5c2695855426aad78eb (patch) | |
| tree | 9c865c2e18fcb814ef80e96965debf53a0923e6a /sql/sql_delete.cc | |
| parent | 1c0a89afcc1581187e8ee84abbd445da2bfa45d9 (diff) | |
| parent | 85a025f30c5196c22c5b1d7960912fe9b3f0d6c0 (diff) | |
| download | mariadb-git-9e74665a2d91e299d1b9c5c2695855426aad78eb.tar.gz | |
Merge 5.5 -> 5.5-mwl248.
Diffstat (limited to 'sql/sql_delete.cc')
| -rw-r--r-- | sql/sql_delete.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_delete.cc b/sql/sql_delete.cc index 351e38ec4f1..bbcc212b1ba 100644 --- a/sql/sql_delete.cc +++ b/sql/sql_delete.cc @@ -328,7 +328,8 @@ bool mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds, while (!(error=info.read_record(&info)) && !thd->killed && ! thd->is_error()) { - update_virtual_fields(thd, table); + if (table->vfield) + update_virtual_fields(thd, table); thd->examined_row_count++; // thd->is_error() is tested to disallow delete row on error if (!select || select->skip_record(thd) > 0) |