table.cc, sql_select.cc:

  Post-merge fix.


sql/sql_select.cc:
  Post-merge fix.
sql/table.cc:
  Post-merge fix.

sql/sql_select.cc

@@ -12313,7 +12313,7 @@ static int test_if_order_by_key(ORDER *order, TABLE *table, uint idx,
       */
       if (!on_primary_key &&
           (table->file->ha_table_flags() & HA_PRIMARY_KEY_IN_READ_INDEX) &&
-          table->s->db_type()->db_type == DB_TYPE_INNODB &&
+          ha_legacy_type(table->s->db_type()) == DB_TYPE_INNODB &&
           table->s->primary_key != MAX_KEY)
       {
         on_primary_key= TRUE;

sql/table.cc

@@ -1351,7 +1351,7 @@ static int open_binary_frm(THD *thd, TABLE_SHARE *share, uchar *head,
           if (ha_option & HA_PRIMARY_KEY_IN_READ_INDEX)
           {
             field->part_of_key= share->keys_in_use;
-            if (share->db_type == DB_TYPE_INNODB && 
+            if (ha_legacy_type(share->db_type()) == DB_TYPE_INNODB &&
                 field->part_of_sortkey.is_set(key))
               field->part_of_sortkey= share->keys_in_use;
           }