bk commit into 5.0 tree (evgen:1.1979) BUG#10802

[eugene]

Below is the list of changes that have just been committed into a local
5.0 repository of evgen. When evgen does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1979 05/08/15 13:02:29 evgen@stripped +2 -0
  Fix bug #10802 Index is not used if table using BDB engine on HP-UX
  
  HP-UX compiler was generating code which makes wrong conversion from double to
  ulonglong which results in not using index in some cases.
  
  Changed type cast operators odrer with which generated code makes proper 
  conversion.

  mysql-test/include/varchar.inc
    1.8 05/08/15 12:41:24 evgen@stripped +1 -0
    Test case for bug #10802 "Index is not used if table using BDB engine on HP-UX" is
same as for bug #9489

  sql/ha_berkeley.cc
    1.154 05/08/15 12:40:06 evgen@stripped +1 -1
    Fix bug #10802 Index is not used if table using BDB engine on HP-UX

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	evgen
# Host:	moonbone.local
# Root:	/work/mysql-5.0-bug-10802

--- 1.153/sql/ha_berkeley.cc	2005-07-20 20:02:25 +04:00
+++ 1.154/sql/ha_berkeley.cc	2005-08-15 12:40:06 +04:00
@@ -2150,7 +2150,7 @@
     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));
 }
 
 

--- 1.7/mysql-test/include/varchar.inc	2005-04-26 18:46:46 +04:00
+++ 1.8/mysql-test/include/varchar.inc	2005-08-15 12:41:24 +04:00
@@ -229,6 +229,7 @@
 
 #
 # 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));