diff options
| author | Alexander Barkov <bar@mariadb.org> | 2016-12-30 15:43:08 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2016-12-30 15:43:08 +0400 |
| commit | 86209c7304fe022e5e3c7b535176cc79661af86b (patch) | |
| tree | 3d9c3b8a54524a66a38c2b82d27c22ff6be22cfa /plugin/feedback/utils.cc | |
| parent | c0fc4391f0f591248865abe0e20842658d878bff (diff) | |
| parent | 9b2bcf19f40ef0f69b6f5da7fd5c348e50b38f2c (diff) | |
| download | mariadb-git-86209c7304fe022e5e3c7b535176cc79661af86b.tar.gz | |
Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3
Diffstat (limited to 'plugin/feedback/utils.cc')
| -rw-r--r-- | plugin/feedback/utils.cc | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/plugin/feedback/utils.cc b/plugin/feedback/utils.cc index 151ecf13c0c..feffc38645d 100644 --- a/plugin/feedback/utils.cc +++ b/plugin/feedback/utils.cc @@ -43,7 +43,11 @@ static const char *get_os_version_name(OSVERSIONINFOEX *ver) { DWORD major = ver->dwMajorVersion; DWORD minor = ver->dwMinorVersion; - + if (major == 10 && minor == 0) + { + return (ver->wProductType == VER_NT_WORKSTATION) ? + "Windows 10" : "Windows Server 2016"; + } if (major == 6 && minor == 3) { return (ver->wProductType == VER_NT_WORKSTATION)? @@ -102,7 +106,12 @@ static int uname(struct utsname *buf) if(version_str && version_str[0]) sprintf(buf->version, "%s %s",version_str, ver.szCSDVersion); else - sprintf(buf->version, "%s", ver.szCSDVersion); + { + /* Fallback for unknown versions, e.g "Windows <major_ver>.<minor_ver>" */ + sprintf(buf->version, "Windows %d.%d%s", + ver.dwMajorVersion, ver.dwMinorVersion, + (ver.wProductType == VER_NT_WORKSTATION ? "" : " Server")); + } #ifdef _WIN64 strcpy(buf->machine, "x64"); |