diff options
| author | dlenev@jabberwock.localdomain <> | 2004-04-02 10:12:53 +0400 |
|---|---|---|
| committer | dlenev@jabberwock.localdomain <> | 2004-04-02 10:12:53 +0400 |
| commit | f6bff2e6c662d4778f86a919b6f7b731d2553f44 (patch) | |
| tree | 9a60588328f7225c26e34d7cf0ce3ae4875c3523 /sql/ha_isammrg.cc | |
| parent | 4533338075714e2be7d4cfc8b2825cb52917603f (diff) | |
| download | mariadb-git-f6bff2e6c662d4778f86a919b6f7b731d2553f44.tar.gz | |
WL#1266 "Separate auto-set logic from TIMESTAMP type."
Final version of patch.
Adds support for specifying of DEFAULT NOW() and/or ON UPDATE NOW()
clauses for TIMESTAMP field definition.
Current implementation allows only one such field per table and
uses several unireg types for storing info about this properties of
field. It should be replaced with better implementation when new
.frm format is introduced.
Diffstat (limited to 'sql/ha_isammrg.cc')
| -rw-r--r-- | sql/ha_isammrg.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/ha_isammrg.cc b/sql/ha_isammrg.cc index 9915c182e26..8f7056a15fa 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(ha_update_count,&LOCK_status); - if (table->time_stamp) - update_timestamp(new_data+table->time_stamp-1); + if (table->timestamp_on_update_now) + update_timestamp(new_data+table->timestamp_on_update_now-1); return !mrg_update(file,old_data,new_data) ? 0 : my_errno ? my_errno : -1; } |