summaryrefslogtreecommitdiff
path: root/sql/ha_isammrg.cc
diff options
context:
space:
mode:
Diffstat (limited to 'sql/ha_isammrg.cc')
-rw-r--r--sql/ha_isammrg.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/ha_isammrg.cc b/sql/ha_isammrg.cc
index 19983e4b257..5a070087724 100644
--- a/sql/ha_isammrg.cc
+++ b/sql/ha_isammrg.cc
@@ -78,8 +78,8 @@ int ha_isammrg::write_row(byte * buf)
int ha_isammrg::update_row(const byte * old_data, byte * new_data)
{
statistic_increment(current_thd->status_var.ha_update_count, &LOCK_status);
- if (table->timestamp_on_update_now)
- update_timestamp(new_data+table->timestamp_on_update_now-1);
+ if (table->timestamp_field_type & TIMESTAMP_AUTO_SET_ON_UPDATE)
+ table->timestamp_field->set_time();
return !mrg_update(file,old_data,new_data) ? 0 : my_errno ? my_errno : -1;
}