diff options
| author | dlenev@mysql.com <> | 2004-10-05 21:24:08 +0400 |
|---|---|---|
| committer | dlenev@mysql.com <> | 2004-10-05 21:24:08 +0400 |
| commit | 96458f8f64641d5b974a17733af8c709b513bfe0 (patch) | |
| tree | 2f32ee4f6e8dfc7434793f44e60c589e84505ad4 /sql | |
| parent | bc46b3c3c55e9c4b666b6ffdfbe0c046fa333cbc (diff) | |
| parent | eabec4c3ca1522e16bf0c3a49da0499c8d22cd31 (diff) | |
| download | mariadb-git-96458f8f64641d5b974a17733af8c709b513bfe0.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/dlenev/src/mysql-4.1-bf
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/field.cc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/sql/field.cc b/sql/field.cc index 8c75bd2d4b5..ec3bd72878d 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -2970,6 +2970,14 @@ timestamp_auto_set_type Field_timestamp::get_auto_set_type() const return TIMESTAMP_AUTO_SET_ON_INSERT; case TIMESTAMP_UN_FIELD: return TIMESTAMP_AUTO_SET_ON_UPDATE; + case TIMESTAMP_OLD_FIELD: + /* + Altough we can have several such columns in legacy tables this + function should be called only for first of them (i.e. the one + having auto-set property). + */ + DBUG_ASSERT(table->timestamp_field == this); + /* Fall-through */ case TIMESTAMP_DNUN_FIELD: return TIMESTAMP_AUTO_SET_ON_BOTH; default: |