summaryrefslogtreecommitdiff
path: root/sql/opt_sum.cc
diff options
context:
space:
mode:
authorunknown <Sinisa@sinisa.nasamreza.org>2002-06-17 20:58:09 +0300
committerunknown <Sinisa@sinisa.nasamreza.org>2002-06-17 20:58:09 +0300
commit4caf38387a95f1cf333628541d4604c5c4a11ef7 (patch)
tree6d6e9fa6a893b908c345c7c3841b5e4e83e1f103 /sql/opt_sum.cc
parentc99fd2caef34cab1677f44cb5c2337d7f6a5c8db (diff)
downloadmariadb-git-4caf38387a95f1cf333628541d4604c5c4a11ef7.tar.gz
My previous patch was not good at all.
This one is better, but should not be final. Better fix is to make some changes in ha_myisammrg::index_read This patch also reverts my previous one ...
Diffstat (limited to 'sql/opt_sum.cc')
-rw-r--r--sql/opt_sum.cc11
1 files changed, 5 insertions, 6 deletions
diff --git a/sql/opt_sum.cc b/sql/opt_sum.cc
index 7ffbb7ba8ea..74e7b2ef3be 100644
--- a/sql/opt_sum.cc
+++ b/sql/opt_sum.cc
@@ -152,12 +152,11 @@ int opt_sum_query(TABLE_LIST *tables, List<Item> &all_fields,COND *conds)
error=table->file->index_last(table->record[0]) !=0;
else
{
- error= table->file->index_read(table->record[0], key_buff,
- ref.key_length,
- HA_READ_AFTER_KEY);
- if (!error)
- error=table->file->index_prev(table->record[0]) ||
- key_cmp(table,key_buff,ref.key,ref.key_length);
+ (void)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 (table->key_read)
{