diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2020-05-18 16:39:38 +0200 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2020-05-18 16:39:38 +0200 |
| commit | 4869e7f4a8d1e997936de775536bf3708cf99529 (patch) | |
| tree | dafa9e5be95f55ad08e5c61b333fb491ae1d6eb0 /sql/mysqld.cc | |
| parent | 5e12aca57f19f3e4f623e92637492edf8a69f42f (diff) | |
| download | mariadb-git-4869e7f4a8d1e997936de775536bf3708cf99529.tar.gz | |
MDEV-22615 system_time_zone may be incorrectly reported as "unknown".
TIME_ZONE_ID_UNKNOWN return code from GetDynamicTimeZoneInformation()
does not mean failure.
It only means, daylight saving dates in the returned strct are not valid.
TIME_ZONE_ID_INVALID means failure, in this case "unknown" should be returned
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index b9908d8c5f3..57eee46a21a 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -4176,7 +4176,7 @@ static void get_win_tzname(char* buf, size_t size) {0,0} }; DYNAMIC_TIME_ZONE_INFORMATION tzinfo; - if (GetDynamicTimeZoneInformation(&tzinfo) == TIME_ZONE_ID_UNKNOWN) + if (GetDynamicTimeZoneInformation(&tzinfo) == TIME_ZONE_ID_INVALID) { strncpy(buf, "unknown", size); return; |