summaryrefslogtreecommitdiff
path: root/sql/ha_heap.cc
diff options
context:
space:
mode:
authorunknown <evgen@sunlight.local>2006-03-30 17:14:55 +0400
committerunknown <evgen@sunlight.local>2006-03-30 17:14:55 +0400
commite0708e2c11b9079fbe85a36fa1790761241b262c (patch)
treef1381200f8493f09eb4e5d618305dc65a91312e0 /sql/ha_heap.cc
parentb7f090e402a27b5407e059a019dcefcfec483efd (diff)
parentff4de9050149bd1ab1727d7f226e094ddcdcd355 (diff)
downloadmariadb-git-e0708e2c11b9079fbe85a36fa1790761241b262c.tar.gz
Manual merge
myisam/mi_search.c: Auto merged mysql-test/t/ctype_utf8.test: Auto merged
Diffstat (limited to 'sql/ha_heap.cc')
-rw-r--r--sql/ha_heap.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/ha_heap.cc b/sql/ha_heap.cc
index 739569e305a..79d4575ff1b 100644
--- a/sql/ha_heap.cc
+++ b/sql/ha_heap.cc
@@ -532,7 +532,7 @@ ha_rows ha_heap::records_in_range(uint inx, key_range *min_key,
return records;
/* Assert that info() did run. We need current statistics here. */
- DBUG_ASSERT(key_stat_version);
+ DBUG_ASSERT(key_stat_version == file->s->key_stat_version);
return key->rec_per_key[key->key_parts-1];
}