summaryrefslogtreecommitdiff
path: root/plugin/feedback
diff options
context:
space:
mode:
authorunknown <sanja@askmonty.org>2013-09-26 21:20:15 +0300
committerunknown <sanja@askmonty.org>2013-09-26 21:20:15 +0300
commite5746665c9f8dcfa66a7a645f1c5517769a2fa0a (patch)
tree56e9d83b5ef43f93d9628c25f69b81f174d48f5c /plugin/feedback
parent828be0d9bae813d0587fbede6e02b12eebac66ca (diff)
parent9d83468e78ba23f024ce3c11443913ad75cf1ea5 (diff)
downloadmariadb-git-e5746665c9f8dcfa66a7a645f1c5517769a2fa0a.tar.gz
merge 10.0-base -> 10.0
Diffstat (limited to 'plugin/feedback')
-rw-r--r--plugin/feedback/utils.cc6
1 files changed, 5 insertions, 1 deletions
diff --git a/plugin/feedback/utils.cc b/plugin/feedback/utils.cc
index c0227cf1292..0510140aee9 100644
--- a/plugin/feedback/utils.cc
+++ b/plugin/feedback/utils.cc
@@ -44,12 +44,16 @@ static const char *get_os_version_name(OSVERSIONINFOEX *ver)
DWORD major = ver->dwMajorVersion;
DWORD minor = ver->dwMinorVersion;
+ if (major == 6 && minor == 3)
+ {
+ return (ver->wProductType == VER_NT_WORKSTATION)?
+ "Windows 8.1":"Windows Server 2012 R2";
+ }
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)?