diff options
| author | Rich Prohaska <prohaska@tokutek.com> | 2014-04-25 14:26:29 -0400 |
|---|---|---|
| committer | Rich Prohaska <prohaska@tokutek.com> | 2014-04-25 14:26:29 -0400 |
| commit | d8fdb8dc9f0fa6ea49f52b52b296f02035f7b123 (patch) | |
| tree | 3f391736ff6bb5adffefabe659a56b73baea6051 /storage | |
| parent | f2a7a7d0b400bb31dc13bd32961e1677e00a6b94 (diff) | |
| download | mariadb-git-d8fdb8dc9f0fa6ea49f52b52b296f02035f7b123.tar.gz | |
#205 build tokudb with webscalesql-5.6
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/tokudb/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | storage/tokudb/hatoku_defines.h | 26 |
2 files changed, 24 insertions, 6 deletions
diff --git a/storage/tokudb/CMakeLists.txt b/storage/tokudb/CMakeLists.txt index 2791401db33..7393c105e04 100644 --- a/storage/tokudb/CMakeLists.txt +++ b/storage/tokudb/CMakeLists.txt @@ -23,6 +23,10 @@ IF(DEFINED TOKUDB_VERSION) ADD_DEFINITIONS("-DTOKUDB_VERSION=\"${TOKUDB_VERSION}\"") ENDIF() +IF(DEFINED TOKUDB_NOPATCH_CONFIG) + ADD_DEFINITIONS("-DTOKUDB_NOPATCH_CONFIG=${TOKUDB_NOPATCH_CONFIG}") +ENDIF() + ADD_SUBDIRECTORY(ft-index) # TODO: clean up includes in ft-index diff --git a/storage/tokudb/hatoku_defines.h b/storage/tokudb/hatoku_defines.h index a3704b26e12..dbc043eb64c 100644 --- a/storage/tokudb/hatoku_defines.h +++ b/storage/tokudb/hatoku_defines.h @@ -97,7 +97,7 @@ PATENT RIGHTS GRANT: #endif #if 100000 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID <= 100099 -// mariadb 10 +// mariadb 10.0 #define TOKU_USE_DB_TYPE_TOKUDB 1 #define TOKU_INCLUDE_ALTER_56 1 #define TOKU_INCLUDE_ROW_TYPE_COMPRESSION 0 @@ -110,22 +110,36 @@ PATENT RIGHTS GRANT: #elif 50700 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID <= 50799 // mysql 5.7 with no patches +#if TOKUDB_NOPATCH_CONFIG #define TOKU_USE_DB_TYPE_UNKNOWN 1 #define TOKU_INCLUDE_ALTER_56 1 +#define TOKU_INCLUDE_ROW_TYPE_COMPRESSION 0 #define TOKU_PARTITION_WRITE_FRM_DATA 0 +#else +#error +#endif #elif 50613 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID <= 50699 -// mysql 5.6 -#define TOKU_USE_DB_TYPE_TOKUDB 1 +// mysql 5.6 with no patches +#if TOKUDB_NOPATCH_CONFIG +#define TOKU_USE_DB_TYPE_UNKNOWN 1 +#define TOKU_INCLUDE_ALTER_56 1 +#define TOKU_INCLUDE_ROW_TYPE_COMPRESSION 0 +#define TOKU_INCLUDE_XA 0 +#define TOKU_PARTITION_WRITE_FRM_DATA 0 +#else +// mysql 5.6 with tokutek patches +#define TOKU_USE_DB_TYPE_TOKUDB 1 /* has DB_TYPE_TOKUDB patch */ #define TOKU_INCLUDE_ALTER_56 1 -#define TOKU_INCLUDE_ROW_TYPE_COMPRESSION 1 -#define TOKU_INCLUDE_XA 1 +#define TOKU_INCLUDE_ROW_TYPE_COMPRESSION 1 /* has tokudb row format compression patch */ +#define TOKU_INCLUDE_XA 1 /* has patch that fixes TC_LOG_MMAP code */ #define TOKU_PARTITION_WRITE_FRM_DATA 0 #define TOKU_INCLUDE_WRITE_FRM_DATA 0 -#define TOKU_INCLUDE_UPSERT 1 +#define TOKU_INCLUDE_UPSERT 1 /* has tokudb upsert patch */ #if defined(HTON_SUPPORTS_EXTENDED_KEYS) #define TOKU_INCLUDE_EXTENDED_KEYS 1 #endif +#endif #elif 50500 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID <= 50599 // mysql 5.5 and mariadb 5.5 |