diff options
| author | unknown <gshchepa/uchum@gleb.loc> | 2007-07-27 13:38:11 +0500 |
|---|---|---|
| committer | unknown <gshchepa/uchum@gleb.loc> | 2007-07-27 13:38:11 +0500 |
| commit | 30408a12d8f0aa8146927fefdcff8921ad642b32 (patch) | |
| tree | 6bf1199047cde5a35117eb3dc03eaf6986ee3fe0 /sql/table.cc | |
| parent | 5cb265d8747314a350d343813edec9c1b94dff75 (diff) | |
| parent | 1a6ced2cfa32d88f8f2ce4691715a2e304af6b6b (diff) | |
| download | mariadb-git-30408a12d8f0aa8146927fefdcff8921ad642b32.tar.gz | |
Merge gleb.loc:/home/uchum/work/bk/5.0-opt
into gleb.loc:/home/uchum/work/bk/5.1-opt
sql/sql_insert.cc:
Auto merged
BitKeeper/deleted/.del-bdb.result:
Auto merged
BitKeeper/deleted/.del-ha_berkeley.cc:
Auto merged
BitKeeper/deleted/.del-rpl_insert_delayed.result:
Auto merged
mysql-test/extra/rpl_tests/rpl_insert_delayed.test:
Auto merged
sql/sql_select.cc:
Merge with 5.0-opt.
sql/table.cc:
Merge with 5.0-opt.
Diffstat (limited to 'sql/table.cc')
| -rw-r--r-- | sql/table.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/table.cc b/sql/table.cc index e6f9b1086c7..a445e2d2816 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -1351,8 +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 (ha_legacy_type(share->db_type()) == DB_TYPE_INNODB && - field->part_of_sortkey.is_set(key)) + if (field->part_of_sortkey.is_set(key)) field->part_of_sortkey= share->keys_in_use; } } |