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 | d11fa88d5d811e79335d360f8fff9837d87b1d8a (patch) | |
tree | 3d38d0a52dc6e3e52f15a8842a7f2a870aa26864 | |
parent | 4abff25a757d62870da26f15cd33fc5198c3b759 (diff) | |
parent | eaf1555c1fa8a185b520fe763cae2876e06cfe70 (diff) | |
download | mariadb-git-mariadb-5.2.13.tar.gz |
merge 5.1mariadb-5.2.13
-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)? |