diff options
| author | Vladislav Vaintroub <wlad@montyprogram.com> | 2011-05-28 16:57:58 +0200 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@montyprogram.com> | 2011-05-28 16:57:58 +0200 |
| commit | b519f2b626ebd1f3243a21dc883cefa6a26460f9 (patch) | |
| tree | faad721ece99fc071000e695861e37d45acda0e5 /sql/field.cc | |
| parent | 152dfe58678af35769ca3cd66db592d129b4c08b (diff) | |
| download | mariadb-git-b519f2b626ebd1f3243a21dc883cefa6a26460f9.tar.gz | |
Fix compile errors and warnings and test errors introduced by microseconds push.
Also, change windows timespec definition to be Unix-ish - simplifies handling a lot.
Diffstat (limited to 'sql/field.cc')
| -rw-r--r-- | sql/field.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/field.cc b/sql/field.cc index 7976c8b0e3c..1887a87f044 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -4602,7 +4602,7 @@ int Field_timestamp::store(double nr) /* We don't want to store invalid or fuzzy datetime values in TIMESTAMP */ if (nr < 0 || nr > LONGLONG_MAX) - nr= LONGLONG_MAX; + nr= (double)LONGLONG_MAX; tmp= number_to_datetime((longlong) floor(nr), &l_time, (thd->variables.sql_mode & MODE_NO_ZERO_DATE) | @@ -5075,7 +5075,7 @@ int Field_temporal::store(double nr) Lazy_string_double str(nr); if (nr < 0 || nr > LONGLONG_MAX) - nr= LONGLONG_MAX; + nr= (double)LONGLONG_MAX; longlong tmp= number_to_datetime((longlong) floor(nr), <ime, (TIME_FUZZY_DATE | (thd->variables.sql_mode & |