~ubuntu-branches/ubuntu/utopic/mariadb-5.5/utopic-security

« back to all changes in this revision

Viewing changes to include/my_global.h

  • Committer: Package Import Robot
  • Author(s): Otto Kekäläinen
  • Date: 2014-04-17 20:55:22 UTC
  • mfrom: (2.1.3 sid)
  • Revision ID: package-import@ubuntu.com-20140417205522-wof4l36nxhlkn89m
* New upstream release, fixing the following security issues:
  * Corresponding MariaDB CVEs for Oracle SPU April 2014 (Closes: #745330)
    - CVE-2014-0384 
    - CVE-2014-2419 
    - CVE-2014-2430 
    - CVE-2014-2431 
    - CVE-2014-2432 
    - CVE-2014-2436 
    - CVE-2014-2438 
    - CVE-2014-2440
* Re-enabled TokuDB with "if arch amd64" in d/rules
* Applied patch to log init output better
  (Closes https://mariadb.atlassian.net/browse/MDEV-5957)

Show diffs side-by-side

added added

removed removed

Lines of Context:
89
89
#define IF_WIN(A,B) B
90
90
#endif
91
91
 
 
92
#ifdef WITH_PARTITION_STORAGE_ENGINE
 
93
#define IF_PARTITIONING(A,B) A
 
94
#else
 
95
#define IF_PARTITIONING(A,B) B
 
96
#endif
 
97
 
92
98
#ifndef EMBEDDED_LIBRARY
93
99
#ifdef WITH_NDB_BINLOG
94
100
#define HAVE_NDB_BINLOG 1