diff options
| author | unknown <gkodinov/kgeorge@magare.gmz> | 2007-07-22 19:23:29 +0300 |
|---|---|---|
| committer | unknown <gkodinov/kgeorge@magare.gmz> | 2007-07-22 19:23:29 +0300 |
| commit | 240bb90ef1ed1bcde9a3420fe790a17bd4d45ee7 (patch) | |
| tree | 5644f2a674fa751aeee1b2338793925c22ac79e1 /sql/table.cc | |
| parent | b29e13ab094c4c09596cf03acb3d21672a0e3376 (diff) | |
| parent | 95a8c6c327a477c3bcaf67ba6acf7f48bbab4158 (diff) | |
| download | mariadb-git-240bb90ef1ed1bcde9a3420fe790a17bd4d45ee7.tar.gz | |
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into magare.gmz:/home/kgeorge/mysql/autopush/B28951-5.0-opt
mysql-test/t/innodb_mysql.test:
Auto merged
sql/sql_select.cc:
Auto merged
sql/table.cc:
Auto merged
mysql-test/r/innodb_mysql.result:
merge of 5.0-opt
Diffstat (limited to 'sql/table.cc')
| -rw-r--r-- | sql/table.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/table.cc b/sql/table.cc index 9c3e7618aa0..b231033d4f2 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -780,7 +780,11 @@ int openfrm(THD *thd, const char *name, const char *alias, uint db_stat, the primary key, then we can use any key to find this column */ if (ha_option & HA_PRIMARY_KEY_IN_READ_INDEX) + { field->part_of_key= share->keys_in_use; + if (field->part_of_sortkey.is_set(key)) + field->part_of_sortkey= share->keys_in_use; + } } if (field->key_length() != key_part->length) { |