diff options
| author | unknown <svoj@may.pils.ru> | 2006-06-21 19:41:09 +0500 |
|---|---|---|
| committer | unknown <svoj@may.pils.ru> | 2006-06-21 19:41:09 +0500 |
| commit | 5b9d44fd868fb5ebf37724800f4dcf6a9549f1a3 (patch) | |
| tree | bd2e438a7edeff0a66537289cedd160add92d3dd /sql/opt_sum.cc | |
| parent | a1ea102599762c85a0d822bb38a2b14e7a88217e (diff) | |
| parent | 630a1ee440a6003a720acab5b89bfe604badd31f (diff) | |
| download | mariadb-git-5b9d44fd868fb5ebf37724800f4dcf6a9549f1a3.tar.gz | |
Merge may.pils.ru:/home/svoj/devel/mysql/BUG20357/mysql-4.1
into may.pils.ru:/home/svoj/devel/mysql/BUG20357/mysql-5.0
mysql-test/r/myisam.result:
Auto merged
mysql-test/t/myisam.test:
Auto merged
sql/opt_sum.cc:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
Diffstat (limited to 'sql/opt_sum.cc')
| -rw-r--r-- | sql/opt_sum.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sql/opt_sum.cc b/sql/opt_sum.cc index 22d84d7fb5a..1f6190241a3 100644 --- a/sql/opt_sum.cc +++ b/sql/opt_sum.cc @@ -701,6 +701,12 @@ static bool find_key_for_maxmin(bool max_fl, TABLE_REF *ref, { KEY_PART_INFO *part,*part_end; key_part_map key_part_to_use= 0; + /* + Perform a check if index is not disabled by ALTER TABLE + or IGNORE INDEX. + */ + if (!table->keys_in_use_for_query.is_set(idx)) + continue; uint jdx= 0; *prefix_len= 0; for (part= keyinfo->key_part, part_end= part+keyinfo->key_parts ; |