summaryrefslogtreecommitdiff
path: root/sql/ha_berkeley.cc
diff options
context:
space:
mode:
authormonty@mysql.com <>2005-08-15 18:35:48 +0300
committermonty@mysql.com <>2005-08-15 18:35:48 +0300
commit1a6f16edd94570eb8359e94149d5393d3dd82888 (patch)
tree613842f6646a144777e4e07d77c2a89dbb659781 /sql/ha_berkeley.cc
parentd0c66bbaa3446f44a1cdd38ffde7527c0a058e2d (diff)
parent4880d22b79fc3ab486a4ec0b4f267bfbe06b367c (diff)
downloadmariadb-git-1a6f16edd94570eb8359e94149d5393d3dd82888.tar.gz
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
Diffstat (limited to 'sql/ha_berkeley.cc')
-rw-r--r--sql/ha_berkeley.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/ha_berkeley.cc b/sql/ha_berkeley.cc
index 105e4e26534..b8a779c08cf 100644
--- a/sql/ha_berkeley.cc
+++ b/sql/ha_berkeley.cc
@@ -2142,7 +2142,7 @@ ha_rows ha_berkeley::records_in_range(uint keynr, key_range *start_key,
end_pos=end_range.less+end_range.equal;
rows=(end_pos-start_pos)*records;
DBUG_PRINT("exit",("rows: %g",rows));
- DBUG_RETURN(rows <= 1.0 ? (ha_rows) 1 : (ha_rows) rows);
+ DBUG_RETURN((ha_rows)(rows <= 1.0 ? 1 : rows));
}