bk commit into 4.1 tree (istruewing:1.2546)

[ingo]

Below is the list of changes that have just been committed into a local
4.1 repository of istruewing. When istruewing 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, 2006-09-15 14:02:43+02:00, istruewing@stripped +1 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-4.1-engines
  into  chilla.local:/home/mydev/mysql-4.1-bug14400
  MERGE: 1.2510.46.3

  myisam/mi_rkey.c@stripped, 2006-09-15 14:02:40+02:00, istruewing@stripped +0 -0
    Auto merged
    MERGE: 1.18.1.3

# 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:	istruewing
# Host:	chilla.local
# Root:	/home/mydev/mysql-4.1-bug14400/RESYNC

--- 1.20/myisam/mi_rkey.c	2006-09-15 14:02:48 +02:00
+++ 1.21/myisam/mi_rkey.c	2006-09-15 14:02:48 +02:00
@@ -103,7 +103,7 @@ int mi_rkey(MI_INFO *info, byte *buf, in
       {
         do
         {
-          uint not_used;
+          uint not_used[2];
           /*
             Skip rows that are inserted by other threads since we got a lock
             Note that this can only happen if we are not searching after an
@@ -122,7 +122,7 @@ int mi_rkey(MI_INFO *info, byte *buf, in
           */
           if (search_flag == HA_READ_KEY_EXACT &&
               ha_key_cmp(keyinfo->seg, key_buff, info->lastkey, use_key_length,
-                         SEARCH_FIND, &not_used))
+                         SEARCH_FIND, not_used))
           {
             my_errno= HA_ERR_KEY_NOT_FOUND;
             info->lastpos= HA_OFFSET_ERROR;