backported MERGE+MAX bugfix from 4.0

9dd13a9a · serg@serg.mysql.com · 92d6bdc1 · 9dd13a9a
Commit 9dd13a9a authored Feb 12, 2003 by serg@serg.mysql.com
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 4 deletions

sql/opt_sum.cc sql/opt_sum.cc +3 -4

No files found.
--- a/sql/opt_sum.cc
+++ b/sql/opt_sum.cc
@@ -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);
+                                         HA_READ_PREFIX_LAST) ||
-	    error=table->file->index_prev(table->record[0]) ||
 	      key_cmp(table,key_buff,ref.key,ref.key_length);
 	  }
 	  if (table->key_read)