Commit 5e84eb56 authored by unknown's avatar unknown

Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt

into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt

parents e307a46c 7ca34a79
...@@ -8820,7 +8820,7 @@ int QUICK_GROUP_MIN_MAX_SELECT::get_next() ...@@ -8820,7 +8820,7 @@ int QUICK_GROUP_MIN_MAX_SELECT::get_next()
#else #else
int result; int result;
#endif #endif
int is_last_prefix; int is_last_prefix= 0;
DBUG_ENTER("QUICK_GROUP_MIN_MAX_SELECT::get_next"); DBUG_ENTER("QUICK_GROUP_MIN_MAX_SELECT::get_next");
...@@ -8835,13 +8835,18 @@ int QUICK_GROUP_MIN_MAX_SELECT::get_next() ...@@ -8835,13 +8835,18 @@ int QUICK_GROUP_MIN_MAX_SELECT::get_next()
Check if this is the last group prefix. Notice that at this point Check if this is the last group prefix. Notice that at this point
this->record contains the current prefix in record format. this->record contains the current prefix in record format.
*/ */
is_last_prefix= key_cmp(index_info->key_part, last_prefix, if (!result)
group_prefix_len); {
DBUG_ASSERT(is_last_prefix <= 0); is_last_prefix= key_cmp(index_info->key_part, last_prefix,
if (result == HA_ERR_KEY_NOT_FOUND) group_prefix_len);
continue; DBUG_ASSERT(is_last_prefix <= 0);
else if (result) }
else
{
if (result == HA_ERR_KEY_NOT_FOUND)
continue;
break; break;
}
if (have_min) if (have_min)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment