diff options
| author | unknown <istruewing@chilla.local> | 2006-09-14 18:12:53 +0200 |
|---|---|---|
| committer | unknown <istruewing@chilla.local> | 2006-09-14 18:12:53 +0200 |
| commit | bb5c07f7228b0186241d3966b378ed5691d62320 (patch) | |
| tree | a340be7e305e4988f17852761272f6fc5f148a43 /storage/myisam/mi_rkey.c | |
| parent | fdf5e5833d262b6e5d21dd70f653557a54770f59 (diff) | |
| parent | 082ac132694f067ce1055220bce42a1a59539538 (diff) | |
| download | mariadb-git-bb5c07f7228b0186241d3966b378ed5691d62320.tar.gz | |
Merge chilla.local:/home/mydev/mysql-5.0-bug14400
into chilla.local:/home/mydev/mysql-5.1-bug14400
storage/myisam/mi_rkey.c:
Auto merged
Diffstat (limited to 'storage/myisam/mi_rkey.c')
| -rw-r--r-- | storage/myisam/mi_rkey.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/myisam/mi_rkey.c b/storage/myisam/mi_rkey.c index 16ba31374c6..3a58b17a983 100644 --- a/storage/myisam/mi_rkey.c +++ b/storage/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; |