diff options
author | unknown <bar@mysql.com> | 2005-03-05 18:20:35 +0400 |
---|---|---|
committer | unknown <bar@mysql.com> | 2005-03-05 18:20:35 +0400 |
commit | e7eac0274ba17953f413e9077226a2246028c5bd (patch) | |
tree | 7975cf16834c464fd8132f9adfa4cf79235cae5c /sql/opt_sum.cc | |
parent | 0d7e68c92a4ded30d02a66b434cbe624c3df5e1e (diff) | |
parent | f1c81bf66960527140d6fe4251ded1a818a3a45e (diff) | |
download | mariadb-git-e7eac0274ba17953f413e9077226a2246028c5bd.tar.gz |
Merge
BitKeeper/etc/logging_ok:
auto-union
innobase/trx/trx0trx.c:
Auto merged
mysql-test/r/ctype_collate.result:
Auto merged
mysql-test/r/func_system.result:
Auto merged
mysql-test/r/type_blob.result:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_create.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/item_strfunc.h:
Auto merged
sql/opt_sum.cc:
Auto merged
innobase/ut/ut0mem.c:
e
merge from 4.1
mysql-test/r/func_group.result:
merge from 4.1
mysql-test/r/func_str.result:
merge from 4.1
mysql-test/t/func_group.test:
merge from 4.1
Diffstat (limited to 'sql/opt_sum.cc')
-rw-r--r-- | sql/opt_sum.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/opt_sum.cc b/sql/opt_sum.cc index ef9babf7713..134d3564ef8 100644 --- a/sql/opt_sum.cc +++ b/sql/opt_sum.cc @@ -638,7 +638,6 @@ static bool find_key_for_maxmin(bool max_fl, TABLE_REF *ref, { if (!(field->flags & PART_KEY_FLAG)) return 0; // Not key field - *prefix_len= 0; TABLE *table= field->table; uint idx= 0; @@ -651,6 +650,7 @@ 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; uint jdx= 0; + *prefix_len= 0; for (part= keyinfo->key_part, part_end= part+keyinfo->key_parts ; part != part_end ; part++, jdx++, key_part_to_use= (key_part_to_use << 1) | 1) |