diff options
| author | unknown <dlenev@mysql.com> | 2004-10-05 21:24:08 +0400 |
|---|---|---|
| committer | unknown <dlenev@mysql.com> | 2004-10-05 21:24:08 +0400 |
| commit | 4a2a1cca6ec1ac3cf41a562428829a7489c4a893 (patch) | |
| tree | 2f32ee4f6e8dfc7434793f44e60c589e84505ad4 | |
| parent | d0538b484f3bec32d1ae544a42447ac136a8b09b (diff) | |
| parent | f092fd5e21903c9c953fd649256dbefa895a15e4 (diff) | |
| download | mariadb-git-4a2a1cca6ec1ac3cf41a562428829a7489c4a893.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/dlenev/src/mysql-4.1-bf
sql/field.cc:
Auto merged
| -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: |