summaryrefslogtreecommitdiff
path: root/sql/ha_berkeley.cc
diff options
context:
space:
mode:
authorstewart@willster.(none) <>2006-08-10 22:55:20 +0800
committerstewart@willster.(none) <>2006-08-10 22:55:20 +0800
commit9d2e6b8d23eb5e18a75a2fcb42a63abc97461c38 (patch)
treeeca32a4dab10c05bdc27fdb082459d63c173bbe4 /sql/ha_berkeley.cc
parent50ae5b7989e6148bee11a718c72ebfdade2ccdc8 (diff)
downloadmariadb-git-9d2e6b8d23eb5e18a75a2fcb42a63abc97461c38.tar.gz
BUG#19914 SELECT COUNT(*) sometimes returns MAX_INT on cluster tables
allow handler::info to return an error code (that will be returned to the user)
Diffstat (limited to 'sql/ha_berkeley.cc')
-rw-r--r--sql/ha_berkeley.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/ha_berkeley.cc b/sql/ha_berkeley.cc
index 33f7b6238b0..e8dbf7ab12d 100644
--- a/sql/ha_berkeley.cc
+++ b/sql/ha_berkeley.cc
@@ -1715,7 +1715,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)
@@ -1735,7 +1735,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->keys)
errkey= last_dup_key;
- DBUG_VOID_RETURN;
+ DBUG_RETURN(0);
}