diff options
author | Alexander Barkov <bar@mariadb.org> | 2018-02-04 18:40:06 +0400 |
---|---|---|
committer | Alexander Barkov <bar@mariadb.org> | 2018-02-04 18:40:06 +0400 |
commit | 217fc122c8e893aa48fa5dcfb3dbfcc99a2aa299 (patch) | |
tree | 83093666c427b4770d82c0ff44f0d7034bec13a8 /sql/compat56.cc | |
parent | d6ed077fc82c2f4d20895db9a6b16ca295f23c33 (diff) | |
parent | 28d4cf0c1b3366c6471866d144ef28fced1e5390 (diff) | |
download | mariadb-git-217fc122c8e893aa48fa5dcfb3dbfcc99a2aa299.tar.gz |
Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3
Diffstat (limited to 'sql/compat56.cc')
-rw-r--r-- | sql/compat56.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/compat56.cc b/sql/compat56.cc index 6cbf4a66ac8..f2be7da8934 100644 --- a/sql/compat56.cc +++ b/sql/compat56.cc @@ -45,8 +45,10 @@ */ longlong TIME_to_longlong_time_packed(const MYSQL_TIME *ltime) { - /* If month is 0, we mix day with hours: "1 00:10:10" -> "24:00:10" */ - long hms= (((ltime->month ? 0 : ltime->day * 24) + ltime->hour) << 12) | + DBUG_ASSERT(ltime->year == 0); + DBUG_ASSERT(ltime->month == 0); + // Mix days with hours: "1 00:10:10" -> "24:00:10" + long hms= ((ltime->day * 24 + ltime->hour) << 12) | (ltime->minute << 6) | ltime->second; longlong tmp= MY_PACKED_TIME_MAKE(hms, ltime->second_part); return ltime->neg ? -tmp : tmp; |