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_berkeley.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_berkeley.cc')
| -rw-r--r-- | sql/ha_berkeley.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/ha_berkeley.cc b/sql/ha_berkeley.cc index 4209bc93d30..ac3625157cf 100644 --- a/sql/ha_berkeley.cc +++ b/sql/ha_berkeley.cc @@ -1756,7 +1756,7 @@ void ha_berkeley::position(const byte *record) } -void ha_berkeley::info(uint flag) +int ha_berkeley::info(uint flag) { DBUG_ENTER("ha_berkeley::info"); if (flag & HA_STATUS_VARIABLE) @@ -1776,7 +1776,7 @@ void ha_berkeley::info(uint flag) /* Don't return key if we got an error for the internal primary key */ if (flag & HA_STATUS_ERRKEY && last_dup_key < table->s->keys) errkey= last_dup_key; - DBUG_VOID_RETURN; + DBUG_RETURN(0); } |