refs #6372 really use DB_TYPE_TOKUDB on mysql 5.6, will need an upgrade procedure

git-svn-id: file:///svn/mysql/tokudb-engine/tokudb-engine@55333 c7de825b-a66e-492c-adef-691d508d4ae1

storage/tokudb/hatoku_defines.h

@@ -47,6 +47,7 @@
 #define TOKU_INCLUDE_WRITE_FRM_DATA 1
 #define TOKU_INCLUDE_UPSERT 1
 #define TOKU_INCLUDE_EXTENDED_KEYS 1
+#define TOKU_INCLUDE_OTHER_DB_TYPE 0
 
 #elif 50500 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID <= 50599
 #define TOKU_INCLUDE_ALTER_56 1
@@ -59,6 +60,7 @@
 #if defined(MARIADB_BASE_VERSION)
 #define TOKU_INCLUDE_EXTENDED_KEYS 1
 #endif
+#define TOKU_INCLUDE_OTHER_DB_TYPE 1
 
 #else
 

storage/tokudb/hatoku_hton.cc

@@ -371,10 +371,14 @@ 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_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
     tokudb_hton->db_type = DB_TYPE_UNKNOWN;
     tokudb_hton->other_db_type = DB_TYPE_TOKUDB;
+#else
+    tokudb_hton->db_type = DB_TYPE_TOKUDB;
+#endif
 
     tokudb_hton->create = tokudb_create_handler;
     tokudb_hton->close_connection = tokudb_close_connection;