diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-03-13 12:30:29 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-03-13 12:31:55 +0200 |
| commit | 5fe87ac413cdc27ef09ea130a0bc4feea410cba0 (patch) | |
| tree | 3d375ccb503dfe23c934928fcf549c8a042a70d7 /sql/sql_time.cc | |
| parent | 51e9381dcc01ebd72d4f0adc057a64213f850d70 (diff) | |
| parent | ed21202a14e981a997061db12b2a377910fb02d5 (diff) | |
| download | mariadb-git-5fe87ac413cdc27ef09ea130a0bc4feea410cba0.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'sql/sql_time.cc')
| -rw-r--r-- | sql/sql_time.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_time.cc b/sql/sql_time.cc index bb400e04e9f..68e0f2acc12 100644 --- a/sql/sql_time.cc +++ b/sql/sql_time.cc @@ -1,5 +1,5 @@ /* Copyright (c) 2000, 2010, Oracle and/or its affiliates. - Copyright (c) 2009, 2013 Monty Program Ab. + Copyright (c) 2009, 2020, MariaDB Corporation. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -476,7 +476,7 @@ bool double_to_datetime_with_warn(double value, MYSQL_TIME *ltime, if (neg) value= -value; - if (value > LONGLONG_MAX) + if (value > static_cast<double>(LONGLONG_MAX)) value= static_cast<double>(LONGLONG_MAX); longlong nr= static_cast<ulonglong>(floor(value)); |