summaryrefslogtreecommitdiff
path: root/myisam
diff options
context:
space:
mode:
authorunknown <istruewing@chilla.local>2006-09-15 07:41:32 +0200
committerunknown <istruewing@chilla.local>2006-09-15 07:41:32 +0200
commit0509d3ebd32d736d3c908dee8f92d2b9f16a4da6 (patch)
treecdca186707600a4bbafb6b588e04f476d1699ae6 /myisam
parent8ee5d2f68496e16fa0a655c3eba2ad727fb3f310 (diff)
parent082ac132694f067ce1055220bce42a1a59539538 (diff)
downloadmariadb-git-0509d3ebd32d736d3c908dee8f92d2b9f16a4da6.tar.gz
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-engines
into chilla.local:/home/mydev/mysql-5.0-bug14400
Diffstat (limited to 'myisam')
-rw-r--r--myisam/mi_rkey.c4
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, &not_used))
+ SEARCH_FIND, not_used))
{
my_errno= HA_ERR_KEY_NOT_FOUND;
info->lastpos= HA_OFFSET_ERROR;