diff options
| author | Alexander Barkov <bar@mariadb.com> | 2018-08-11 19:12:13 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.com> | 2018-08-11 19:12:13 +0400 |
| commit | 7a022d706155cb2ac00936d6829883b40af7f147 (patch) | |
| tree | 2688e55bead181720dd75330769ea758c5909fb5 /sql/field.h | |
| parent | 73a5dd8c54a12fd5efaa90df6a99dad73aee1679 (diff) | |
| download | mariadb-git-7a022d706155cb2ac00936d6829883b40af7f147.tar.gz | |
A cleanup for MDEV-16939: avoid timeval initialization related problems in the future (compilation failures on Windows)
Adding a helper class Timeval, to initialize "struct timeval" in a safe way.
As a bonus, adding a method Timeval::trunc(), so the caller now can have
one line instead of five lines (declaration, initializations of sec and usec,
truncation, passing to store_TIMEVAL()).
Diffstat (limited to 'sql/field.h')
| -rw-r--r-- | sql/field.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/sql/field.h b/sql/field.h index b35b31bb444..8b080a0d06f 100644 --- a/sql/field.h +++ b/sql/field.h @@ -2756,11 +2756,7 @@ public: } void store_TIME(my_time_t timestamp, ulong sec_part) { - timeval tv; - tv.tv_sec= timestamp; - tv.tv_usec= sec_part; - my_timeval_trunc(&tv, decimals()); - store_TIMEVAL(tv); + store_TIMEVAL(Timeval(timestamp, sec_part).trunc(decimals())); } bool get_date(MYSQL_TIME *ltime, ulonglong fuzzydate); uchar *pack(uchar *to, const uchar *from, |