diff options
| author | unknown <kent@kent-amd64.(none)> | 2007-07-21 01:53:19 +0200 |
|---|---|---|
| committer | unknown <kent@kent-amd64.(none)> | 2007-07-21 01:53:19 +0200 |
| commit | 47507276aa628ab51878ca36f0af47541ac04755 (patch) | |
| tree | 0b56ddbf67df3ed64d453b4f68cc0e931ca79549 /sql/field.cc | |
| parent | 366c21fef8981a6ca3ac909eb14b75b99a0a5278 (diff) | |
| parent | d758b1e629a78e1cf58c8a04da51e3c33630368c (diff) | |
| download | mariadb-git-47507276aa628ab51878ca36f0af47541ac04755.tar.gz | |
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/kent/bk/tmp3/mysql-5.0-build
libmysql/libmysql.c:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
sql/field.cc:
Auto merged
Diffstat (limited to 'sql/field.cc')
| -rw-r--r-- | sql/field.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/field.cc b/sql/field.cc index 58832db04cd..78b2515c55f 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -5271,7 +5271,8 @@ int Field_newdate::store(const char *from,uint len,CHARSET_INFO *cs) else { tmp= l_time.day + l_time.month*32 + l_time.year*16*32; - if (!error && (ret != MYSQL_TIMESTAMP_DATE)) + if (!error && (ret != MYSQL_TIMESTAMP_DATE) && + thd->count_cuted_fields != CHECK_FIELD_IGNORE) error= 3; // Datetime was cut (note) } |