diff options
| author | Mohammad Dashti <mdashti@gmail.com> | 2021-04-27 15:02:17 +0000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2021-04-27 15:24:38 +0000 |
| commit | 86eaa89e91a6cc5c5e9251ea5aa3e10cc2ed3f67 (patch) | |
| tree | cd9fc35f823741e037530e4936cb2a3b76110479 /src/mongo/db | |
| parent | 63026dcec31e315648cefb79630308868d983203 (diff) | |
| download | mongo-86eaa89e91a6cc5c5e9251ea5aa3e10cc2ed3f67.tar.gz | |
SERVER-56371 Upgrade timelib to 2021.06
(cherry picked from commit 0c7ff5fc51ce3cdfd103798e38525a99590430b8)
Diffstat (limited to 'src/mongo/db')
| -rw-r--r-- | src/mongo/db/query/datetime/date_time_support.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/mongo/db/query/datetime/date_time_support.cpp b/src/mongo/db/query/datetime/date_time_support.cpp index 76002d0d87d..766c6fbbe9c 100644 --- a/src/mongo/db/query/datetime/date_time_support.cpp +++ b/src/mongo/db/query/datetime/date_time_support.cpp @@ -185,7 +185,8 @@ void TimeZoneDatabase::loadTimeZoneInfo( << timelib_get_error_message(errorCode)}); } - invariant(errorCode == TIMELIB_ERROR_NO_ERROR); + invariant(errorCode == TIMELIB_ERROR_NO_ERROR || + errorCode == TIMELIB_ERROR_EMPTY_POSIX_STRING); _timeZones[entry.id] = TimeZone{tzInfo}; } } @@ -194,7 +195,7 @@ TimeZone TimeZoneDatabase::utcZone() { return TimeZone{nullptr}; } -static timelib_tzinfo* timezonedatabase_gettzinfowrapper(char* tz_id, +static timelib_tzinfo* timezonedatabase_gettzinfowrapper(const char* tz_id, const _timelib_tzdb* db, int* error) { return nullptr; |