diff options
| author | unknown <knielsen@knielsen-hq.org> | 2012-03-24 18:21:22 +0100 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2012-03-24 18:21:22 +0100 |
| commit | 335de5db1834d3aeac507f18fcd5143c22150500 (patch) | |
| tree | 95ac83922a28c81982c9ad89fcaba6c040b5111b /sql/sql_handler.cc | |
| parent | b34cfe9327f2dcedb6bebfacdc2e757b6285426d (diff) | |
| parent | f72e0e686b2f3688fe98685107a293de5012be03 (diff) | |
| download | mariadb-git-335de5db1834d3aeac507f18fcd5143c22150500.tar.gz | |
Merge mariadb 5.3->mariadb 5.5
Diffstat (limited to 'sql/sql_handler.cc')
| -rw-r--r-- | sql/sql_handler.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_handler.cc b/sql/sql_handler.cc index c67618f0680..d03b38171fc 100644 --- a/sql/sql_handler.cc +++ b/sql/sql_handler.cc @@ -922,7 +922,8 @@ retry: goto ok; } /* Generate values for virtual fields */ - update_virtual_fields(thd, table); + if (table->vfield) + update_virtual_fields(thd, table); if (cond && !cond->val_int()) { if (thd->is_error()) |