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/item_timefunc.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/item_timefunc.cc')
| -rw-r--r-- | sql/item_timefunc.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_timefunc.cc b/sql/item_timefunc.cc index e4a2595efed..31607d79e56 100644 --- a/sql/item_timefunc.cc +++ b/sql/item_timefunc.cc @@ -100,7 +100,7 @@ bool Item_func_sec_to_time::sec_to_time(my_decimal *seconds, MYSQL_TIME *ltime) my_decimal_mul(E_DEC_FATAL_ERROR, &tmp, &sub_seconds, &time_second_part_factor); (void) decimal2longlong(&tmp, &full_seconds); - ltime->second_part= full_seconds; + ltime->second_part= (ulong)full_seconds; return 0; |