summaryrefslogtreecommitdiff
path: root/sql/opt_sum.cc
diff options
context:
space:
mode:
authormonty@hundin.mysql.fi <>2001-09-21 03:38:35 +0300
committermonty@hundin.mysql.fi <>2001-09-21 03:38:35 +0300
commit5a14bb2a7ee1f5461f73004833fe7439a282de35 (patch)
treebd27d62de7286eca9070d981c59b7cc1c889d9f1 /sql/opt_sum.cc
parentea0523bd719e59205cb0259a0977ae6c07a7ca00 (diff)
downloadmariadb-git-5a14bb2a7ee1f5461f73004833fe7439a282de35.tar.gz
Integrated table->ref_primary_key into table->part_of_key
Fixed bug in UNION
Diffstat (limited to 'sql/opt_sum.cc')
-rw-r--r--sql/opt_sum.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/opt_sum.cc b/sql/opt_sum.cc
index c16c0d919d4..182fb6cf362 100644
--- a/sql/opt_sum.cc
+++ b/sql/opt_sum.cc
@@ -305,7 +305,7 @@ static bool find_range_key(TABLE_REF *ref, Field* field, COND *cond)
key>>=1;
ref->key_length=0;
ref->key=idx;
- if (field->part_of_key & ((table_map) 1 << idx))
+ if (field->part_of_key & ((key_map) 1 << idx))
{
table->key_read=1;
table->file->extra(HA_EXTRA_KEYREAD);
@@ -350,7 +350,7 @@ static bool find_range_key(TABLE_REF *ref, Field* field, COND *cond)
{
ref->key_length= (uint) (key_ptr-ref->key_buff);
ref->key=idx;
- if (field->part_of_key & ((table_map) 1 << idx))
+ if (field->part_of_key & ((key_map) 1 << idx))
{
table->key_read=1;
table->file->extra(HA_EXTRA_KEYREAD);