← Back to branch summary

~ubuntu-branches/ubuntu/trusty/mariadb-5.5/trusty-proposed

« back to all changes in this revision

Viewing changes to plugin/feedback/utils.cc

  • Committer: Package Import Robot
  • Author(s): James Page, Otto Kekäläinen
  • Date: 2014-02-17 16:51:52 UTC
  • mfrom: (2.1.1 sid)
  • Revision ID: package-import@ubuntu.com-20140217165152-k315d3175g865kkx
Tags: 5.5.35-1
http://bugs.debian.org/737597
http://bugs.debian.org/733002
http://bugs.debian.org/734426
http://bugs.debian.org/735284
http://bugs.debian.org/736480
http://bugs.debian.org/732967
[ Otto Kekäläinen ]
* New upstream release, fixing the following security issues:
  - Buffer overflow in client/mysql.cc (Closes: #737597).
    - CVE-2014-0001
  - http://www.oracle.com/technetwork/topics/security/cpujan2014-1972949.html
    - CVE-2013-5891
    - CVE-2013-5908
    - CVE-2014-0386
    - CVE-2014-0393
    - CVE-2014-0401
    - CVE-2014-0402
    - CVE-2014-0412
    - CVE-2014-0420
    - CVE-2014-0437
* Upstream https://mariadb.atlassian.net/browse/MDEV-4902
  fixes compatibility with Bison 3.0 (Closes: #733002)
* Updated Russian debconf translation (Closes: #734426)
* Updated Japanese debconf translation (Closes: #735284)
* Updated French debconf translation (Closes: #736480)
* Renamed SONAME properly (Closes: #732967)

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/feedback/utils.cc
44
44
  DWORD major = ver->dwMajorVersion;
45
45
  DWORD minor = ver->dwMinorVersion;
46
46
 
 
47
  if (major == 6 && minor == 3)
 
48
  {
 
49
    return (ver->wProductType == VER_NT_WORKSTATION)?
 
50
      "Windows 8.1":"Windows Server 2012 R2";    
 
51
  } 
47
52
  if (major == 6 && minor == 2)
48
53
  {
49
54
    return (ver->wProductType == VER_NT_WORKSTATION)?
50
55
      "Windows 8":"Windows Server 2012";    
51
56
  }
52
 
  
53
57
  if (major == 6 && minor == 1)
54
58
  {
55
59
    return (ver->wProductType == VER_NT_WORKSTATION)?