diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-11-02 17:33:02 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-11-02 17:33:02 +0100 |
| commit | 50556e7e9ac3cf0bad629cc3eb4b57f82cf807e4 (patch) | |
| tree | 1990e4b2f274d83ba4f7fdd86e089a6c6f415160 | |
| parent | a2a18dd9d78e10649c5dc2de899c35569f2e201f (diff) | |
| download | mariadb-git-50556e7e9ac3cf0bad629cc3eb4b57f82cf807e4.tar.gz | |
tokudb post-merge fixes
| -rw-r--r-- | storage/tokudb/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | storage/tokudb/hatoku_defines.h | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/storage/tokudb/CMakeLists.txt b/storage/tokudb/CMakeLists.txt index 0ce3f3e1aa2..7732ac6369c 100644 --- a/storage/tokudb/CMakeLists.txt +++ b/storage/tokudb/CMakeLists.txt @@ -18,7 +18,7 @@ IF(NOT LIBJEMALLOC) ENDIF() ############################################ -SET(TOKUDB_VERSION "7.5.0") +SET(TOKUDB_VERSION "tokudb-7.5.3") SET(TOKUDB_DEB_FILES "usr/lib/mysql/plugin/ha_tokudb.so\netc/mysql/conf.d/tokudb.cnf\nusr/bin/tokuftdump\nusr/share/doc/mariadb-server-5.5/README-TOKUDB\nusr/share/doc/mariadb-server-5.5/README.md" PARENT_SCOPE) SET(USE_BDB OFF CACHE BOOL "") MARK_AS_ADVANCED(BUILDNAME) diff --git a/storage/tokudb/hatoku_defines.h b/storage/tokudb/hatoku_defines.h index 72b95ce308e..5b2231caec3 100644 --- a/storage/tokudb/hatoku_defines.h +++ b/storage/tokudb/hatoku_defines.h @@ -153,7 +153,7 @@ PATENT RIGHTS GRANT: #define TOKU_USE_DB_TYPE_TOKUDB 1 #define TOKU_INCLUDE_ALTER_56 0 /* MariaDB 5.5 */ #define TOKU_INCLUDE_ALTER_55 0 /* MariaDB 5.5 */ -#define TOKU_INCLUDE_ROW_TYPE_COMPRESSION 1 +#define TOKU_INCLUDE_ROW_TYPE_COMPRESSION 0 /* MariaDB 5.5 */ #define TOKU_INCLUDE_XA 1 #define TOKU_PARTITION_WRITE_FRM_DATA 0 /* MariaDB 5.5 */ #define TOKU_INCLUDE_WRITE_FRM_DATA 0 /* MariaDB 5.5 */ @@ -161,6 +161,7 @@ PATENT RIGHTS GRANT: #if defined(MARIADB_BASE_VERSION) #define TOKU_INCLUDE_EXTENDED_KEYS 1 #define TOKU_INCLUDE_OPTION_STRUCTS 1 +#define TOKU_CLUSTERING_IS_COVERING 1 #endif #define TOKU_INCLUDE_HANDLERTON_HANDLE_FATAL_SIGNAL 0 /* MariaDB 5.5 */ |