diff options
| author | Vladislav Vaintroub <wlad@montyprogram.com> | 2012-11-22 18:29:53 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@montyprogram.com> | 2012-11-22 18:29:53 +0100 |
| commit | 089119cab57460a61851b8f387c72efddcf74a55 (patch) | |
| tree | 3d38d0a52dc6e3e52f15a8842a7f2a870aa26864 /plugin | |
| parent | cbae294396429682a22371f23a048dcd0d4c71da (diff) | |
| parent | 3fa356106694857a2e89e3aa135679799cbe7543 (diff) | |
| download | mariadb-git-089119cab57460a61851b8f387c72efddcf74a55.tar.gz | |
merge 5.1
Diffstat (limited to 'plugin')
| -rw-r--r-- | plugin/feedback/utils.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/plugin/feedback/utils.cc b/plugin/feedback/utils.cc index 48bbd72d530..708cc04f33e 100644 --- a/plugin/feedback/utils.cc +++ b/plugin/feedback/utils.cc @@ -44,6 +44,12 @@ static const char *get_os_version_name(OSVERSIONINFOEX *ver) DWORD major = ver->dwMajorVersion; DWORD minor = ver->dwMinorVersion; + if (major == 6 && minor == 2) + { + return (ver->wProductType == VER_NT_WORKSTATION)? + "Windows 8":"Windows Server 2012"; + } + if (major == 6 && minor == 1) { return (ver->wProductType == VER_NT_WORKSTATION)? |