diff options
| author | unknown <jimw@mysql.com> | 2005-07-20 10:16:43 -0700 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-07-20 10:16:43 -0700 |
| commit | 2de1318c47465d266b7849d54a6ec03a29123b3c (patch) | |
| tree | aa53f028e240faf0a684bde94b6eff49560a2dc1 | |
| parent | 7389e540372c15a801e5c5e84c0eeab8c86f412d (diff) | |
| download | mariadb-git-2de1318c47465d266b7849d54a6ec03a29123b3c.tar.gz | |
Fix date conversion on 32-bit machines.
sql/field.cc:
Fix type of temporary variables for handling result of
number_to_datetime().
| -rw-r--r-- | sql/field.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/field.cc b/sql/field.cc index 2d7cc4b6b35..3fdd7ab45e6 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -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 | |