Bug#16391678 EXT. SECONDARY KEYS DON'T WORK FOR CUSTOM STORAGE ENGINES

Sergey Glukhov · Sergey Glukhov · commit 93f2f63177a9 · 2013-05-23T12:39:49.000+04:00
Added possibility to use 'extended keys' feature for custom storage engines.
diff --git a/sql/handler.h b/sql/handler.h
@@ -968,6 +968,17 @@ struct handlerton
 #define HTON_TEMPORARY_NOT_SUPPORTED (1 << 6) //Having temporary tables not supported
 #define HTON_SUPPORT_LOG_TABLES      (1 << 7) //Engine supports log tables
 #define HTON_NO_PARTITION            (1 << 8) //You can not partition these tables
+
+/**
+  Engine supports extended keys. The flag allows to
+  use 'extended key' feature if the engine is able to
+  do it (has primary key values in the secondary key).
+  Note that handler flag HA_PRIMARY_KEY_IN_READ_INDEX is
+  actually partial case of HTON_SUPPORTS_EXTENDED_KEYS.
+*/
+
+#define HTON_SUPPORTS_EXTENDED_KEYS  (1 << 9) 
+
 /*
   This flag should be set when deciding that the engine does not allow row based
   binary logging (RBL) optimizations.
diff --git a/sql/table.cc b/sql/table.cc
@@ -1101,7 +1101,9 @@ static int open_binary_frm(THD *thd, TABLE_SHARE *share, uchar *head,
 
   strpos=disk_buff+6;  
 
-  use_extended_sk= (legacy_db_type == DB_TYPE_INNODB);
+  use_extended_sk=
+    ha_check_storage_engine_flag(share->db_type(),
+                                 HTON_SUPPORTS_EXTENDED_KEYS);
 
   uint total_key_parts;
   if (use_extended_sk)
@@ -1175,12 +1177,12 @@ static int open_binary_frm(THD *thd, TABLE_SHARE *share, uchar *head,
       key_part->store_length=key_part->length;
     }
     /*
-      Add PK parts if engine supports PK extension for secondary keys.
-      Atm it works for Innodb only. Here we add unique first key parts
-      to the end of secondary key parts array and increase actual number
-      of key parts. Note that primary key is always first if exists.
-      Later if there is no PK in the table then number of actual keys parts
-      is set to user defined key parts.
+      Add primary key parts if engine supports primary key extension for
+      secondary keys. Here we add unique first key parts to the end of
+      secondary key parts array and increase actual number of key parts.
+      Note that primary key is always first if exists. Later if there is no
+      primary key in the table then number of actual keys parts is set to
+      user defined key parts.
     */
     keyinfo->actual_key_parts= keyinfo->user_defined_key_parts;
     keyinfo->actual_flags= keyinfo->flags;
diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
@@ -2771,7 +2771,7 @@ innobase_init(
 
 	innobase_hton->flush_logs = innobase_flush_logs;
 	innobase_hton->show_status = innobase_show_status;
-	innobase_hton->flags = HTON_NO_FLAGS;
+	innobase_hton->flags = HTON_SUPPORTS_EXTENDED_KEYS;
 
 	innobase_hton->release_temporary_latches =
 		innobase_release_temporary_latches;
