diff options
| author | Kentoku SHIBA <kentokushiba@gmail.com> | 2021-04-28 16:45:50 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-28 16:45:50 +0900 |
| commit | 977115add60f0f9d6258e5ebcb512a1c97492691 (patch) | |
| tree | 6c5dff26ceecebc6607a180b98b8711b88dd25f7 /sql/win_tzname_data.h | |
| parent | b5d4964d1e56f91a0f129e72e850ed6220c52002 (diff) | |
| parent | 4cd92143eae9b397589e5b449d1a85c43b3e4f6b (diff) | |
| download | mariadb-git-977115add60f0f9d6258e5ebcb512a1c97492691.tar.gz | |
Merge branch '10.4' into bb-10.4-MDEV-22265bb-10.4-MDEV-22265
Diffstat (limited to 'sql/win_tzname_data.h')
| -rw-r--r-- | sql/win_tzname_data.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/win_tzname_data.h b/sql/win_tzname_data.h index 03197227f8e..792cdbc7a13 100644 --- a/sql/win_tzname_data.h +++ b/sql/win_tzname_data.h @@ -12,6 +12,7 @@ {L"US Mountain Standard Time","America/Phoenix"}, {L"Mountain Standard Time (Mexico)","America/Chihuahua"}, {L"Mountain Standard Time","America/Denver"}, +{L"Yukon Standard Time","America/Whitehorse"}, {L"Central America Standard Time","America/Guatemala"}, {L"Central Standard Time","America/Chicago"}, {L"Easter Island Standard Time","Pacific/Easter"}, |