diff options
| author | Rich Prohaska <prohaska@tokutek.com> | 2013-10-23 12:30:07 -0400 |
|---|---|---|
| committer | Rich Prohaska <prohaska@tokutek.com> | 2013-10-23 12:30:07 -0400 |
| commit | 99c4881478035b1aadfbb315abffe665913b8d44 (patch) | |
| tree | e643d3552f1a8ea93b668e24447ff904b3c9d1d3 /storage/tokudb/hatoku_defines.h | |
| parent | ef1764465c22f7c279c4d7e8a9eb244830f37995 (diff) | |
| download | mariadb-git-99c4881478035b1aadfbb315abffe665913b8d44.tar.gz | |
tokutek/mysql56#23 turn on extended keys for tokudb
Diffstat (limited to 'storage/tokudb/hatoku_defines.h')
| -rw-r--r-- | storage/tokudb/hatoku_defines.h | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/storage/tokudb/hatoku_defines.h b/storage/tokudb/hatoku_defines.h index b6919e022e7..5c93936e31a 100644 --- a/storage/tokudb/hatoku_defines.h +++ b/storage/tokudb/hatoku_defines.h @@ -121,14 +121,6 @@ PATENT RIGHTS GRANT: #if defined(TOKUDB_PATCHES) && TOKUDB_PATCHES == 0 -#elif 100000 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID <= 100099 -#define TOKU_INCLUDE_ALTER_56 0 -#define TOKU_INCLUDE_ALTER_55 0 -#define TOKU_INCLUDE_ROW_TYPE_COMPRESSION 0 -#define TOKU_INCLUDE_XA 1 -#define TOKU_PARTITION_WRITE_FRM_DATA 0 -#define TOKU_INCLUDE_WRITE_FRM_DATA 0 - #elif 50613 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID <= 50699 #define TOKU_INCLUDE_ALTER_56 1 #define TOKU_INCLUDE_ROW_TYPE_COMPRESSION 1 @@ -136,17 +128,9 @@ PATENT RIGHTS GRANT: #define TOKU_PARTITION_WRITE_FRM_DATA 0 #define TOKU_INCLUDE_WRITE_FRM_DATA 0 #define TOKU_INCLUDE_UPSERT 1 -#define TOKU_INCLUDE_EXTENDED_KEYS 0 - -#elif 50610 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID <= 50610 -#define TOKU_INCLUDE_ALTER_56 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 +#if defined(HTON_SUPPORTS_EXTENDED_KEYS) #define TOKU_INCLUDE_EXTENDED_KEYS 1 -#define TOKU_INCLUDE_OTHER_DB_TYPE 0 +#endif #elif 50500 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID <= 50599 #define TOKU_INCLUDE_ALTER_56 1 |