summaryrefslogtreecommitdiff
path: root/sql/ha_isam.cc
diff options
context:
space:
mode:
authorstewart@willster.(none) <>2006-09-28 23:41:37 +1000
committerstewart@willster.(none) <>2006-09-28 23:41:37 +1000
commit57a97f53bc13488d702ee3478aba83ffa4de5f7a (patch)
treeeb9ad699c3a5035d182101ae8e8082d97593b767 /sql/ha_isam.cc
parent3ecc09e0e4671431d7caeab1760faccf0636fe41 (diff)
downloadmariadb-git-57a97f53bc13488d702ee3478aba83ffa4de5f7a.tar.gz
BUG#19914 SELECT COUNT(*) sometimes returns MAX_INT on cluster tables
post-review fixes as indicated by Serg. manual testing of error cases done in 5.0 due to support for DBUG_EXECUTE_IF to insert errors. Unable to write test case for mysql-test until 5.1 due to support for setting debug options at runtime.
Diffstat (limited to 'sql/ha_isam.cc')
-rw-r--r--sql/ha_isam.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/ha_isam.cc b/sql/ha_isam.cc
index afa7dffa5f4..34d5440a0f8 100644
--- a/sql/ha_isam.cc
+++ b/sql/ha_isam.cc
@@ -178,7 +178,7 @@ void ha_isam::position(const byte *record)
ha_store_ptr(ref, ref_length, position);
}
-void ha_isam::info(uint flag)
+int ha_isam::info(uint flag)
{
N_ISAMINFO info;
(void) nisam_info(file,&info,flag);
@@ -224,6 +224,7 @@ void ha_isam::info(uint flag)
}
if (flag & HA_STATUS_TIME)
update_time = info.update_time;
+ return 0;
}