summaryrefslogtreecommitdiff
path: root/sql/ha_berkeley.h
diff options
context:
space:
mode:
authorstewart@willster.(none) <>2006-10-16 17:39:38 +1000
committerstewart@willster.(none) <>2006-10-16 17:39:38 +1000
commitc1903d967ae3a82818778c83dbed401144c48a2e (patch)
treed301ac33f253385737189c92d56fb5c94d4e76c9 /sql/ha_berkeley.h
parent848f91799c8c09cf8813ebdead535d1a339ee179 (diff)
parent57a97f53bc13488d702ee3478aba83ffa4de5f7a (diff)
downloadmariadb-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_berkeley.h')
-rw-r--r--sql/ha_berkeley.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/ha_berkeley.h b/sql/ha_berkeley.h
index 16e4db59c10..2ff0a7cf044 100644
--- a/sql/ha_berkeley.h
+++ b/sql/ha_berkeley.h
@@ -123,7 +123,7 @@ class ha_berkeley: public handler
int rnd_next(byte *buf);
int rnd_pos(byte * buf, byte *pos);
void position(const byte *record);
- void info(uint);
+ int info(uint);
int extra(enum ha_extra_function operation);
int reset(void);
int external_lock(THD *thd, int lock_type);