refs #5852 ext keys in 5.6

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

storage/tokudb/ha_tokudb.cc

@@ -284,10 +284,12 @@ static inline uint get_key_parts(const KEY *key) {
 
 #if TOKU_INCLUDE_EXTENDED_KEYS
 static inline uint get_ext_key_parts(const KEY *key) {
-#if defined(MARIADB_BASE_VERSION)
+#if 50609 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID <= 50699
+    return key->actual_key_parts;
+#elif defined(MARIADB_BASE_VERSION)
     return key->ext_key_parts;
 #else
-    return get_key_parts(key);
+#error
 #endif
 }
 #endif
@@ -2948,8 +2950,7 @@ DBT *ha_tokudb::pack_ext_key(
         for (uint pk_index = 0; key_part != end && (int) key_length > 0 && pk_index < pk_parts; pk_index++) {
             uint i;
             for (i = 0; i < pk_next; i++) {
-                // TODO how to really compare key parts?
-                if (pk_info[i].key_part->field == pk_key_info->key_part[pk_index].field)
+                if (pk_info[i].key_part->fieldnr == pk_key_info->key_part[pk_index].fieldnr)
                     break;
             }
             if (i < pk_next) {

storage/tokudb/hatoku_defines.h

@@ -46,7 +46,9 @@
 #define TOKU_PARTITION_WRITE_FRM_DATA 1
 #define TOKU_INCLUDE_WRITE_FRM_DATA 1
 #define TOKU_INCLUDE_UPSERT 1
-#define TOKU_INCLUDE_EXTENDED_KEYS 0 // not yet implemented
+#if DB_TYPE_TOKUDB_DEFINED
+#define TOKU_INCLUDE_EXTENDED_KEYS 1
+#endif
 
 #elif 50500 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID <= 50599
 #define TOKU_INCLUDE_ALTER_56 1