summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorunknown <evgen@moonbone.local>2005-08-15 14:01:42 +0400
committerunknown <evgen@moonbone.local>2005-08-15 14:01:42 +0400
commit73c6702f9fd3c8348ecb46b5e8b0ff21abf3e0bc (patch)
treed8a223888cf8f1e318cacb5b572c0db7213e5b2e /sql
parent6ed4935212ce5a3e8824ad25a9eb6718e2703537 (diff)
parent58e86f9b50f176912ab71eed8b0f4a2b22d3775e (diff)
downloadmariadb-git-73c6702f9fd3c8348ecb46b5e8b0ff21abf3e0bc.tar.gz
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
into moonbone.local:/work/mysql-5.0-bug-11864
Diffstat (limited to 'sql')
-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 793029ab4c7..4a7585d800e 100644
--- a/sql/ha_berkeley.cc
+++ b/sql/ha_berkeley.cc
@@ -2150,7 +2150,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));
}