Commit 082ac132 authored by unknown's avatar unknown

Merge chilla.local:/home/mydev/mysql-4.1-bug14400

into  chilla.local:/home/mydev/mysql-5.0-bug14400


myisam/mi_rkey.c:
  Auto merged
parents fa1436bf addff97f
...@@ -104,7 +104,7 @@ int mi_rkey(MI_INFO *info, byte *buf, int inx, const byte *key, uint key_len, ...@@ -104,7 +104,7 @@ int mi_rkey(MI_INFO *info, byte *buf, int inx, const byte *key, uint key_len,
{ {
do do
{ {
uint not_used; uint not_used[2];
/* /*
Skip rows that are inserted by other threads since we got a lock 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 Note that this can only happen if we are not searching after an
...@@ -123,7 +123,7 @@ int mi_rkey(MI_INFO *info, byte *buf, int inx, const byte *key, uint key_len, ...@@ -123,7 +123,7 @@ int mi_rkey(MI_INFO *info, byte *buf, int inx, const byte *key, uint key_len,
*/ */
if (search_flag == HA_READ_KEY_EXACT && if (search_flag == HA_READ_KEY_EXACT &&
ha_key_cmp(keyinfo->seg, key_buff, info->lastkey, use_key_length, 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; my_errno= HA_ERR_KEY_NOT_FOUND;
info->lastpos= HA_OFFSET_ERROR; info->lastpos= HA_OFFSET_ERROR;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment