summaryrefslogtreecommitdiff
path: root/myisam/mi_rkey.c
diff options
context:
space:
mode:
authormonty@donna.mysql.fi <>2001-04-01 13:45:48 +0300
committermonty@donna.mysql.fi <>2001-04-01 13:45:48 +0300
commit65822120f5b553914de5d3c8983014ae896ee81a (patch)
treeb31bc7d8e38b04c6603c8f2240f10f86497e5003 /myisam/mi_rkey.c
parenta49a2e20012c5722e99e17cb3ef9c28a04389d96 (diff)
downloadmariadb-git-65822120f5b553914de5d3c8983014ae896ee81a.tar.gz
Fixed bug in ALTER TABLE
Removed _mi_rkey() function New fork_big.pl multi-thread test
Diffstat (limited to 'myisam/mi_rkey.c')
-rw-r--r--myisam/mi_rkey.c14
1 files changed, 3 insertions, 11 deletions
diff --git a/myisam/mi_rkey.c b/myisam/mi_rkey.c
index d201694ab05..84612779f5d 100644
--- a/myisam/mi_rkey.c
+++ b/myisam/mi_rkey.c
@@ -22,8 +22,8 @@
/* Read a record using key */
/* Ordinary search_flag is 0 ; Give error if no record with key */
-int _mi_rkey(MI_INFO *info, byte *buf, int inx, const byte *key, uint key_len,
- enum ha_rkey_function search_flag, bool raw_key)
+int mi_rkey(MI_INFO *info, byte *buf, int inx, const byte *key, uint key_len,
+ enum ha_rkey_function search_flag)
{
uchar *key_buff;
MYISAM_SHARE *share=info->s;
@@ -37,7 +37,7 @@ int _mi_rkey(MI_INFO *info, byte *buf, int inx, const byte *key, uint key_len,
info->update&= (HA_STATE_CHANGED | HA_STATE_ROW_CHANGED);
- if (raw_key)
+ if (!info->use_packed_key)
{
if (key_len == 0)
key_len=USE_WHOLE_KEY;
@@ -101,11 +101,3 @@ int _mi_rkey(MI_INFO *info, byte *buf, int inx, const byte *key, uint key_len,
err:
DBUG_RETURN(my_errno);
} /* _mi_rkey */
-
-/* shouldn't forget to do it inline sometime */
-int mi_rkey(MI_INFO *info, byte *buf, int inx, const byte *key, uint key_len,
- enum ha_rkey_function search_flag)
-{
- return _mi_rkey(info,buf,inx,key,key_len,search_flag,TRUE);
-}
-