database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0

Browse Source 
into  mysql.com:/home/kent/bk/tmp3/mysql-5.0-build
This commit is contained in:
kent@kent-amd64.(none)
2007-07-21 01:53:19 +02:00
parent 1a86cbd26f e50e8c94fc
commit 9d247f296a
59 changed files with 1008 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/field.cc
View File

@ -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)
}