database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

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

Browse Source 
into  selena.:H:/MYSQL/src/#15634-mysql-5.0
This commit is contained in:
SergeyV@selena.
2006-01-30 17:03:09 +03:00
parent 779df9d95e 6d55b423d8
commit 624eec4f58
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/field.cc
View File

@ -5239,7 +5239,7 @@ int Field_date::store(double nr)
else
tmp= (longlong) rint(nr);
return Field_date::store(tmp);
return Field_date::store(tmp, TRUE);
}
@ -5261,6 +5261,9 @@ int Field_date::store(longlong nr, bool unsigned_val)
error= 2;
}
if (nr >= 19000000000000.0 && nr <= 99991231235959.0)
nr=floor(nr/1000000.0); // Timestamp to date
if (error)
set_datetime_warning(MYSQL_ERROR::WARN_LEVEL_WARN,
error == 2 ? ER_WARN_DATA_OUT_OF_RANGE :