diff options
| author | unknown <istruewing@chilla.local> | 2006-09-14 17:50:59 +0200 |
|---|---|---|
| committer | unknown <istruewing@chilla.local> | 2006-09-14 17:50:59 +0200 |
| commit | 082ac132694f067ce1055220bce42a1a59539538 (patch) | |
| tree | d719142987db291312f7dfe610523c549a7fb7e4 /myisam | |
| parent | fa1436bf1f87cbe627d42e75b5e84cf7eb40b6b8 (diff) | |
| parent | addff97f31bcf599f959d0647f69166162740bb0 (diff) | |
| download | mariadb-git-082ac132694f067ce1055220bce42a1a59539538.tar.gz | |
Merge chilla.local:/home/mydev/mysql-4.1-bug14400
into chilla.local:/home/mydev/mysql-5.0-bug14400
myisam/mi_rkey.c:
Auto merged
Diffstat (limited to 'myisam')
| -rw-r--r-- | myisam/mi_rkey.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/myisam/mi_rkey.c b/myisam/mi_rkey.c index 16ba31374c6..3a58b17a983 100644 --- a/myisam/mi_rkey.c +++ b/myisam/mi_rkey.c @@ -104,7 +104,7 @@ int mi_rkey(MI_INFO *info, byte *buf, int inx, const byte *key, uint key_len, { 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 @@ -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 && ha_key_cmp(keyinfo->seg, key_buff, info->lastkey, use_key_length, - SEARCH_FIND, ¬_used)) + SEARCH_FIND, not_used)) { my_errno= HA_ERR_KEY_NOT_FOUND; info->lastpos= HA_OFFSET_ERROR; |