summaryrefslogtreecommitdiff
path: root/sql/sql_update.cc
diff options
context:
space:
mode:
authorIgor Babaev <igor@askmonty.org>2010-07-17 12:58:08 -0700
committerIgor Babaev <igor@askmonty.org>2010-07-17 12:58:08 -0700
commit4f564a5443c6a907449bc4d2c3e7f6f89dbf4485 (patch)
tree3d34791cab99e31a3c1414710841a9eef7b728c9 /sql/sql_update.cc
parentf58199f6f6b4795ab5d0db65ebdde8bd4897333e (diff)
parent452860dfdead7f47b0312598db95ea09201e9d4e (diff)
downloadmariadb-git-4f564a5443c6a907449bc4d2c3e7f6f89dbf4485.tar.gz
Merge
Diffstat (limited to 'sql/sql_update.cc')
-rw-r--r--sql/sql_update.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_update.cc b/sql/sql_update.cc
index 61e93e7c5b1..c231fd7afc6 100644
--- a/sql/sql_update.cc
+++ b/sql/sql_update.cc
@@ -472,7 +472,7 @@ int mysql_update(THD *thd,
while (!(error=info.read_record(&info)) &&
!thd->killed && !thd->is_error())
{
- update_virtual_fields(table);
+ update_virtual_fields(thd, table);
if (!select || select->skip_record(thd) > 0)
{
if (table->file->was_semi_consistent_read())
@@ -580,7 +580,7 @@ int mysql_update(THD *thd,
while (!(error=info.read_record(&info)) && !thd->killed)
{
- update_virtual_fields(table);
+ update_virtual_fields(thd, table);
if (!select || select->skip_record(thd) > 0)
{
if (table->file->was_semi_consistent_read())