Commit 73c6702f authored by unknown's avatar unknown
Browse files

Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 

into moonbone.local:/work/mysql-5.0-bug-11864
parents 6ed49352 58e86f9b

mysql-test/include/varchar.inc

+1 −0
Original line number Diff line number Diff line
@@ -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));

sql/ha_berkeley.cc

+1 −1
Original line number Diff line number Diff line
@@ -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));

}