mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 12:02:42 +01:00
Tokutek/mariadb#12 rebase to mariadb-5.5.34
This commit is contained in:
parent
d425e30c3b
commit
2df023d3dd
1 changed files with 18 additions and 1 deletions
|
@ -122,6 +122,7 @@ PATENT RIGHTS GRANT:
|
|||
#if defined(TOKUDB_PATCHES) && TOKUDB_PATCHES == 0
|
||||
|
||||
#elif 100000 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID <= 100099
|
||||
// mariadb 10
|
||||
#define TOKU_USE_DB_TYPE_TOKUDB 1
|
||||
#define TOKU_INCLUDE_ALTER_56 1
|
||||
#define TOKU_INCLUDE_ROW_TYPE_COMPRESSION 0
|
||||
|
@ -132,11 +133,13 @@ PATENT RIGHTS GRANT:
|
|||
#endif
|
||||
|
||||
#elif 50700 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID <= 50799
|
||||
// mysql 5.7 with no patches
|
||||
#define TOKU_USE_DB_TYPE_UNKNOWN 1
|
||||
#define TOKU_INCLUDE_ALTER_56 1
|
||||
#define TOKU_PARTITION_WRITE_FRM_DATA 0
|
||||
|
||||
#elif 50613 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID <= 50699
|
||||
// mysql 5.6
|
||||
#define TOKU_USE_DB_TYPE_TOKUDB 1
|
||||
#define TOKU_INCLUDE_ALTER_56 1
|
||||
#define TOKU_INCLUDE_ROW_TYPE_COMPRESSION 1
|
||||
|
@ -148,7 +151,21 @@ PATENT RIGHTS GRANT:
|
|||
#define TOKU_INCLUDE_EXTENDED_KEYS 1
|
||||
#endif
|
||||
|
||||
#elif defined(MARIADB_BASE_VERSION) && 50534 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID <= 50599
|
||||
// mariadb 5.5.X where X >= 34
|
||||
#define TOKU_USE_DB_TYPE_UNKNOWN 1
|
||||
#define TOKU_INCLUDE_ALTER_56 1
|
||||
#define TOKU_INCLUDE_ALTER_55 1
|
||||
#define TOKU_INCLUDE_ROW_TYPE_COMPRESSION 1
|
||||
#define TOKU_INCLUDE_XA 1
|
||||
#define TOKU_PARTITION_WRITE_FRM_DATA 1
|
||||
#define TOKU_INCLUDE_WRITE_FRM_DATA 1
|
||||
#define TOKU_INCLUDE_UPSERT 1
|
||||
#define TOKU_INCLUDE_EXTENDED_KEYS 1
|
||||
#define TOKU_INCLUDE_HANDLERTON_HANDLE_FATAL_SIGNAL 1
|
||||
|
||||
#elif 50500 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID <= 50599
|
||||
// mysql 5.5 and mariadb 5.5
|
||||
#define TOKU_USE_OTHER_DB_TYPE 1
|
||||
#define TOKU_INCLUDE_ALTER_56 1
|
||||
#define TOKU_INCLUDE_ALTER_55 1
|
||||
|
@ -161,8 +178,8 @@ PATENT RIGHTS GRANT:
|
|||
#define TOKU_INCLUDE_EXTENDED_KEYS 1
|
||||
#endif
|
||||
#define TOKU_INCLUDE_HANDLERTON_HANDLE_FATAL_SIGNAL 1
|
||||
#else
|
||||
|
||||
#else
|
||||
#error
|
||||
|
||||
#endif
|
||||
|
|
Loading…
Reference in a new issue