From 4c0111460bae6b62999c1e17482f5560909cb482 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 30 Mar 2006 03:11:37 +0300 Subject: Cleanup during review of new pushed code sql/ha_heap.cc: Indentation fixes strings/ctype-ucs2.c: Simplify code tests/mysql_client_test.c: Remove compiler warnings --- sql/ha_heap.cc | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) (limited to 'sql') diff --git a/sql/ha_heap.cc b/sql/ha_heap.cc index ab0ab5d8b64..9c680daaf91 100644 --- a/sql/ha_heap.cc +++ b/sql/ha_heap.cc @@ -480,17 +480,13 @@ ha_rows ha_heap::records_in_range(uint inx, key_range *min_key, min_key->flag != HA_READ_KEY_EXACT || max_key->flag != HA_READ_AFTER_KEY) return HA_POS_ERROR; // Can only use exact keys - else - { - if (records <= 1) - return records; - else - { - /* Assert that info() did run. We need current statistics here. */ - DBUG_ASSERT(key_stat_version == file->s->key_stat_version); - return key->rec_per_key[key->key_parts-1]; - } - } + + if (records <= 1) + return records; + + /* Assert that info() did run. We need current statistics here. */ + DBUG_ASSERT(key_stat_version == file->s->key_stat_version); + return key->rec_per_key[key->key_parts-1]; } -- cgit v1.2.1