tokudb post-merge fixes

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)

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 */