diff options
| author | Alexander Barkov <bar@mariadb.com> | 2018-11-23 19:04:42 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.com> | 2018-11-26 08:10:47 +0400 |
| commit | 4447a02cf13a49876001a40ca7db8fdedb731fd5 (patch) | |
| tree | 1ccf39024e26a1efa68237e5d44a2296a990441d /sql/my_decimal.cc | |
| parent | 27f3329ff6cb755b600d536347669bef1a7d98b5 (diff) | |
| download | mariadb-git-4447a02cf13a49876001a40ca7db8fdedb731fd5.tar.gz | |
MDEV-16991 Rounding vs truncation for TIME, DATETIME, TIMESTAMPbb-10.4-mdev16991
Diffstat (limited to 'sql/my_decimal.cc')
| -rw-r--r-- | sql/my_decimal.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/my_decimal.cc b/sql/my_decimal.cc index de7018c53cb..6927b181d92 100644 --- a/sql/my_decimal.cc +++ b/sql/my_decimal.cc @@ -268,7 +268,8 @@ int str2my_decimal(uint mask, const char *from, size_t length, integer part cannot be larger that 1e18 (otherwise it's an overflow). fractional part is microseconds. */ -bool my_decimal2seconds(const my_decimal *d, ulonglong *sec, ulong *microsec) +bool my_decimal2seconds(const my_decimal *d, ulonglong *sec, + ulong *microsec, ulong *nanosec) { int pos; @@ -286,6 +287,7 @@ bool my_decimal2seconds(const my_decimal *d, ulonglong *sec, ulong *microsec) } *microsec= d->frac ? static_cast<longlong>(d->buf[pos+1]) / (DIG_BASE/1000000) : 0; + *nanosec= d->frac ? static_cast<longlong>(d->buf[pos+1]) % (DIG_BASE/1000000) : 0; if (pos > 1) { |