diff options
| author | unknown <evgen@moonbone.local> | 2005-08-15 14:01:42 +0400 |
|---|---|---|
| committer | unknown <evgen@moonbone.local> | 2005-08-15 14:01:42 +0400 |
| commit | 73c6702f9fd3c8348ecb46b5e8b0ff21abf3e0bc (patch) | |
| tree | d8a223888cf8f1e318cacb5b572c0db7213e5b2e | |
| parent | 6ed4935212ce5a3e8824ad25a9eb6718e2703537 (diff) | |
| parent | 58e86f9b50f176912ab71eed8b0f4a2b22d3775e (diff) | |
| download | mariadb-git-73c6702f9fd3c8348ecb46b5e8b0ff21abf3e0bc.tar.gz | |
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
into moonbone.local:/work/mysql-5.0-bug-11864
| -rw-r--r-- | mysql-test/include/varchar.inc | 1 | ||||
| -rw-r--r-- | sql/ha_berkeley.cc | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/mysql-test/include/varchar.inc b/mysql-test/include/varchar.inc index 13b4315f2b8..70b563e871c 100644 --- a/mysql-test/include/varchar.inc +++ b/mysql-test/include/varchar.inc @@ -229,6 +229,7 @@ drop table t1; # # Bug #9489: problem with hash indexes +# Bug #10802: Index is not used if table using BDB engine on HP-UX # create table t1(a int, b varchar(12), key ba(b, a)); 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)); } |