Commit 93ae805d authored by jimw@mysql.com's avatar jimw@mysql.com

Fix date conversion on 32-bit machines.

parent 4570ace8
......@@ -4543,9 +4543,9 @@ int Field_timestamp::store(longlong nr)
THD *thd= table->in_use;
/* We don't want to store invalid or fuzzy datetime values in TIMESTAMP */
long tmp= number_to_datetime(nr, &l_time, (thd->variables.sql_mode &
MODE_NO_ZERO_DATE) |
MODE_NO_ZERO_IN_DATE, &error);
longlong tmp= number_to_datetime(nr, &l_time, (thd->variables.sql_mode &
MODE_NO_ZERO_DATE) |
MODE_NO_ZERO_IN_DATE, &error);
if (tmp < 0)
{
error= 2;
......@@ -5389,7 +5389,7 @@ int Field_newdate::store(double nr)
int Field_newdate::store(longlong nr)
{
TIME l_time;
long tmp;
longlong tmp;
int error;
if ((tmp= number_to_datetime(nr, &l_time,
(TIME_FUZZY_DATE |
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment