diff options
| author | gshchepa/uchum@gleb.loc <> | 2007-07-26 04:41:48 +0500 |
|---|---|---|
| committer | gshchepa/uchum@gleb.loc <> | 2007-07-26 04:41:48 +0500 |
| commit | dfbfeeceb362de8f25ae239de4743b90a06bf36d (patch) | |
| tree | c3a2ca7f4a12bc797b0b6be3792781b429b77595 /sql | |
| parent | f129754096ff75d32a7f84872f9d65a819e8445b (diff) | |
| download | mariadb-git-dfbfeeceb362de8f25ae239de4743b90a06bf36d.tar.gz | |
table.cc, sql_select.cc:
Post-merge fix.
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_select.cc | 2 | ||||
| -rw-r--r-- | sql/table.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 0973971de1c..668b7e99549 100644 --- a/sql/sql_select.cc +++ b/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; diff --git a/sql/table.cc b/sql/table.cc index a7ab27f0760..fb88b46972c 100644 --- a/sql/table.cc +++ b/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; } |