diff options
author | stewart@willster.(none) <> | 2006-10-16 17:39:38 +1000 |
---|---|---|
committer | stewart@willster.(none) <> | 2006-10-16 17:39:38 +1000 |
commit | c1903d967ae3a82818778c83dbed401144c48a2e (patch) | |
tree | d301ac33f253385737189c92d56fb5c94d4e76c9 /sql/ha_heap.cc | |
parent | 848f91799c8c09cf8813ebdead535d1a339ee179 (diff) | |
parent | 57a97f53bc13488d702ee3478aba83ffa4de5f7a (diff) | |
download | mariadb-git-c1903d967ae3a82818778c83dbed401144c48a2e.tar.gz |
Merge willster.(none):/home/stewart/Documents/MySQL/4.1/bug19914-mk2
into willster.(none):/home/stewart/Documents/MySQL/5.0/bug19914-mk2-merge
Diffstat (limited to 'sql/ha_heap.cc')
-rw-r--r-- | sql/ha_heap.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/ha_heap.cc b/sql/ha_heap.cc index 3aaa0287098..34ef888a029 100644 --- a/sql/ha_heap.cc +++ b/sql/ha_heap.cc @@ -332,7 +332,7 @@ void ha_heap::position(const byte *record) *(HEAP_PTR*) ref= heap_position(file); // Ref is aligned } -void ha_heap::info(uint flag) +int ha_heap::info(uint flag) { HEAPINFO info; (void) heap_info(file,&info,flag); @@ -354,6 +354,7 @@ void ha_heap::info(uint flag) */ if (key_stat_version != file->s->key_stat_version) update_key_stats(); + return 0; } int ha_heap::extra(enum ha_extra_function operation) |