diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-02-06 17:12:17 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-02-06 17:12:17 +0200 |
| commit | 883496782f37cd53acd10d90527af97aca3fd34f (patch) | |
| tree | 36c2d3a7cf10df47651a2dc35144afd475beeabe /sql/compat56.cc | |
| parent | eda142590f385b3d79e7b6a6e0cc13ba8fd25961 (diff) | |
| parent | 560b9895d413bdfedda0a0ca871a635858990c05 (diff) | |
| download | mariadb-git-883496782f37cd53acd10d90527af97aca3fd34f.tar.gz | |
Merge bb-10.2-ext into 10.3
Diffstat (limited to 'sql/compat56.cc')
| -rw-r--r-- | sql/compat56.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/compat56.cc b/sql/compat56.cc index f2be7da8934..16c25924d6e 100644 --- a/sql/compat56.cc +++ b/sql/compat56.cc @@ -47,7 +47,7 @@ longlong TIME_to_longlong_time_packed(const MYSQL_TIME *ltime) { DBUG_ASSERT(ltime->year == 0); DBUG_ASSERT(ltime->month == 0); - // Mix days with hours: "1 00:10:10" -> "24:00:10" + // Mix days with hours: "1 00:10:10" -> "24:10:10" long hms= ((ltime->day * 24 + ltime->hour) << 12) | (ltime->minute << 6) | ltime->second; longlong tmp= MY_PACKED_TIME_MAKE(hms, ltime->second_part); |