summaryrefslogtreecommitdiff
path: root/sql/opt_sum.cc
diff options
context:
space:
mode:
authorserg@serg.mysql.com <>2003-01-17 12:48:23 +0100
committerserg@serg.mysql.com <>2003-01-17 12:48:23 +0100
commit390982aaa39687b1b631a013b6ff2108eaab9a96 (patch)
treedd0b99625dd290258e67a9dceab71e771142c48d /sql/opt_sum.cc
parentc16e908a2bb32c4ae945b0d0856a92ae309c8514 (diff)
downloadmariadb-git-390982aaa39687b1b631a013b6ff2108eaab9a96.tar.gz
bugfix for MERGE tables and MAX(key)
Diffstat (limited to 'sql/opt_sum.cc')
-rw-r--r--sql/opt_sum.cc7
1 files changed, 3 insertions, 4 deletions
diff --git a/sql/opt_sum.cc b/sql/opt_sum.cc
index 4b6a196051e..ecfa97586e9 100644
--- a/sql/opt_sum.cc
+++ b/sql/opt_sum.cc
@@ -38,7 +38,7 @@ int opt_sum_query(TABLE_LIST *tables, List<Item> &all_fields,COND *conds)
table_map removed_tables=0;
Item *item;
COND *org_conds= conds;
-
+
/* Add all ON conditions to WHERE condition */
for (TABLE_LIST *tl=tables; tl ; tl= tl->next)
{
@@ -165,10 +165,9 @@ int opt_sum_query(TABLE_LIST *tables, List<Item> &all_fields,COND *conds)
error=table->file->index_last(table->record[0]) !=0;
else
{
- (void)table->file->index_read(table->record[0], key_buff,
+ error = table->file->index_read(table->record[0], key_buff,
ref.key_length,
- HA_READ_AFTER_KEY);
- error=table->file->index_prev(table->record[0]) ||
+ HA_READ_PREFIX_LAST) ||
key_cmp(table,key_buff,ref.key,ref.key_length);
}
if (table->key_read)