From fc12cafff26e9372568c71b91ee73680c77605d4 Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 15 Jun 2002 20:59:42 +0300 Subject: Fixed a bug in optimiser with MERGE tables with non-unique values with aggregating functions. This consistently crashed Mysql --- sql/opt_sum.cc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'sql/opt_sum.cc') diff --git a/sql/opt_sum.cc b/sql/opt_sum.cc index efb4c4916a5..7ffbb7ba8ea 100644 --- a/sql/opt_sum.cc +++ b/sql/opt_sum.cc @@ -152,11 +152,12 @@ int opt_sum_query(TABLE_LIST *tables, List &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]) || - key_cmp(table,key_buff,ref.key,ref.key_length); + if (!error) + error=table->file->index_prev(table->record[0]) || + key_cmp(table,key_buff,ref.key,ref.key_length); } if (table->key_read) { -- cgit v1.2.1