summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorunknown <sasha@asksasha.com>2005-09-19 15:45:01 -0600
committerunknown <sasha@asksasha.com>2005-09-19 15:45:01 -0600
commit5cf25d8019db1800c63e080aba87b825c90301f6 (patch)
tree4e3f9a564dd7b81e605425aa8182904e36250c20 /sql
parentce7e95d41d7c8aa2fef96728d8b2036ff22b5e5c (diff)
parentf903f8e3a2af33c7269dfe9f4434e7585a87798e (diff)
downloadmariadb-git-5cf25d8019db1800c63e080aba87b825c90301f6.tar.gz
Merge spachev@bk-internal.mysql.com:/home/bk/mysql-4.1
into asksasha.com:/reiser-data/mysql-dev/mysql-4.1-bug11139
Diffstat (limited to 'sql')
-rw-r--r--sql/opt_sum.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/opt_sum.cc b/sql/opt_sum.cc
index 4ab506cc4e1..cb8e3c2d273 100644
--- a/sql/opt_sum.cc
+++ b/sql/opt_sum.cc
@@ -661,7 +661,8 @@ static bool find_key_for_maxmin(bool max_fl, TABLE_REF *ref,
If key_part2 may be NULL, then we want to find the first row
that is not null
*/
- ref->key_buff[ref->key_length++]= 1;
+ ref->key_buff[ref->key_length]= 1;
+ ref->key_length+= part->store_length;
*range_fl&= ~NO_MIN_RANGE;
*range_fl|= NEAR_MIN; // > NULL
}