diff options
| author | unknown <knielsen@knielsen-hq.org> | 2012-12-18 15:01:58 +0100 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2012-12-18 15:01:58 +0100 |
| commit | 701419b02f12688188a7d4183523e0f5ee9ae09a (patch) | |
| tree | 9cad9901bbf188c5ab30aeb31f10c71f61921312 /sql/handler.cc | |
| parent | 4923d19b7c3c4c034f70ac1411837afa75c4b6ad (diff) | |
| parent | 6c3de76ad5cb8683ab8b049e0bbba670115d304a (diff) | |
| download | mariadb-git-701419b02f12688188a7d4183523e0f5ee9ae09a.tar.gz | |
Merge MariaDB 10.0-base to MariaDB 10.0
Diffstat (limited to 'sql/handler.cc')
| -rw-r--r-- | sql/handler.cc | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/sql/handler.cc b/sql/handler.cc index 271ed73ad53..bf84b1287d5 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -5363,10 +5363,6 @@ int handler::ha_write_row(uchar *buf) DBUG_ENTER("handler::ha_write_row"); DEBUG_SYNC_C("ha_write_row_start"); - /* If we have a timestamp column, update it to the current time */ - if (table->timestamp_field_type & TIMESTAMP_AUTO_SET_ON_INSERT) - table->timestamp_field->set_time(); - MYSQL_INSERT_ROW_START(table_share->db.str, table_share->table_name.str); mark_trx_read_write(); increment_statistics(&SSV::ha_write_count); @@ -5397,9 +5393,6 @@ int handler::ha_update_row(const uchar *old_data, uchar *new_data) */ DBUG_ASSERT(new_data == table->record[0]); - if (table->timestamp_field_type & TIMESTAMP_AUTO_SET_ON_UPDATE) - table->timestamp_field->set_time(); - MYSQL_UPDATE_ROW_START(table_share->db.str, table_share->table_name.str); mark_trx_read_write(); increment_statistics(&SSV::ha_update_count); |