tokutek/mysql56#23 turn on extended keys for tokudb

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

storage/tokudb/hatoku_hton.cc

@@ -315,6 +315,15 @@ static int tokudb_init_func(void *p) {
     // tokudb_hton->flags= HTON_CAN_RECREATE;  // QQQ this came from skeleton
     tokudb_hton->flags = HTON_CLOSE_CURSORS_AT_COMMIT;
 
+#if TOKU_INCLUDE_EXTENDED_KEYS
+#if defined(HTON_SUPPORTS_EXTENDED_KEYS)
+    tokudb_hton->flags |= HTON_SUPPORTS_EXTENDED_KEYS;
+#endif
+#if defined(HTON_EXTENDED_KEYS)
+    tokudb_hton->flags |= HTON_EXTENDED_KEYS;
+#endif
+#endif
+
 #if TOKU_INCLUDE_OTHER_DB_TYPE
     // we have historically been a dynamic storage engine, so we set db_type according.
     // however, extended keys is triggered off of the db_type, so tokudb adds another type so that extended keys works