diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-01-10 15:40:21 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-01-10 15:40:21 +0100 |
| commit | 4f67a14700c0266c58b05be0dbd8fc10f88464a6 (patch) | |
| tree | 568cd8f2997888d5c1035ad8e9b5e823197dcf62 /plugin | |
| parent | b0ee31c89480519490537b89dca1e8cc65e2b73b (diff) | |
| parent | bd87fed1dc0caa0720e5a60f0fca1b714c58ac75 (diff) | |
| download | mariadb-git-4f67a14700c0266c58b05be0dbd8fc10f88464a6.tar.gz | |
5.2->5.3 merge
Diffstat (limited to 'plugin')
| -rw-r--r-- | plugin/feedback/Makefile.am | 3 | ||||
| -rw-r--r-- | plugin/feedback/utils.cc | 6 |
2 files changed, 9 insertions, 0 deletions
diff --git a/plugin/feedback/Makefile.am b/plugin/feedback/Makefile.am index 7d2a61d593f..339aabf0efc 100644 --- a/plugin/feedback/Makefile.am +++ b/plugin/feedback/Makefile.am @@ -5,6 +5,9 @@ INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include \ EXTRA_LTLIBRARIES = feedback.la libfeedback.la pkgplugin_LTLIBRARIES = @plugin_feedback_shared_target@ feedback_la_LDFLAGS = -module -rpath $(pkgplugindir) -L$(top_builddir)/libservices -lmysqlservices +if HAVE_YASSL +feedback_la_LIBADD = @yassl_libs@ +endif feedback_la_CXXFLAGS = -shared -DMYSQL_DYNAMIC_PLUGIN feedback_la_SOURCES = feedback.cc utils.cc url_base.cc url_http.cc \ sender_thread.cc 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)? |