diff options
| author | unknown <knielsen@knielsen-hq.org> | 2012-03-24 18:25:00 +0100 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2012-03-24 18:25:00 +0100 |
| commit | 99aa3d465e9141fdcc7bbd93d4c7f6cfecb27165 (patch) | |
| tree | be730ce0fb603c4c527f6584369bafe636c0a62a /sql/sql_update.cc | |
| parent | 5c01f1ac1498a9b32bdccb817cdbc0b3ca3687d6 (diff) | |
| parent | 335de5db1834d3aeac507f18fcd5143c22150500 (diff) | |
| download | mariadb-git-99aa3d465e9141fdcc7bbd93d4c7f6cfecb27165.tar.gz | |
Merge MariaDB 5.3 into latest MariaDB 5.5
Diffstat (limited to 'sql/sql_update.cc')
| -rw-r--r-- | sql/sql_update.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/sql_update.cc b/sql/sql_update.cc index 5fa30c91417..f9502589beb 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -559,7 +559,8 @@ int mysql_update(THD *thd, while (!(error=info.read_record(&info)) && !thd->killed) { - update_virtual_fields(thd, table); + if (table->vfield) + update_virtual_fields(thd, table); thd->examined_row_count++; if (!select || (error= select->skip_record(thd)) > 0) { @@ -674,7 +675,8 @@ int mysql_update(THD *thd, while (!(error=info.read_record(&info)) && !thd->killed) { - update_virtual_fields(thd, table); + if (table->vfield) + update_virtual_fields(thd, table); thd->examined_row_count++; if (!select || select->skip_record(thd) > 0) { |