bk commit into 5.1 tree (mikron:1.2462)

[mikael]

Below is the list of changes that have just been committed into a local
5.1 repository of mikron. When mikron 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@stripped, 2007-03-06 01:53:09+01:00, mikron@stripped +1 -0
  Merge fixes

  sql/ha_ndbcluster.cc@stripped, 2007-03-06 01:53:04+01:00, mikron@stripped
+2 -2
    Merge fixes

# 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:	mikron
# Host:	25.37.251.10.in-addr.arpa
# Root:	/Users/mikron/mysql_clones/build_bench

--- 1.421/sql/ha_ndbcluster.cc	2007-03-06 01:14:43 +01:00
+++ 1.422/sql/ha_ndbcluster.cc	2007-03-06 01:53:04 +01:00
@@ -8627,7 +8627,7 @@
    * Also no reason to multi-range handling when only one range
    */
   if (range_count == 1 || uses_blob_value() ||
-      (index_type ==  UNIQUE_INDEX &&
+      (cur_index_type ==  UNIQUE_INDEX &&
        has_null_in_unique_index(active_index) &&
        null_value_index_search(ranges, ranges+range_count, buffer)))
   {
@@ -8727,7 +8727,7 @@
     }
     DBUG_ASSERT(m_active_trans);
     no_record_found= FALSE;
-    switch(index_type){
+    switch(cur_index_type){
     case PRIMARY_KEY_ORDERED_INDEX:
       if (!(multi_range_curr->start_key.length == key_info->key_length &&
           multi_range_curr->start_key.flag == HA_READ_KEY_EXACT))