diff options
| author | monty@donna.mysql.fi <> | 2001-04-01 13:45:48 +0300 |
|---|---|---|
| committer | monty@donna.mysql.fi <> | 2001-04-01 13:45:48 +0300 |
| commit | 65822120f5b553914de5d3c8983014ae896ee81a (patch) | |
| tree | b31bc7d8e38b04c6603c8f2240f10f86497e5003 /myisammrg | |
| parent | a49a2e20012c5722e99e17cb3ef9c28a04389d96 (diff) | |
| download | mariadb-git-65822120f5b553914de5d3c8983014ae896ee81a.tar.gz | |
Fixed bug in ALTER TABLE
Removed _mi_rkey() function
New fork_big.pl multi-thread test
Diffstat (limited to 'myisammrg')
| -rw-r--r-- | myisammrg/myrg_rkey.c | 4 | ||||
| -rw-r--r-- | myisammrg/myrg_rnext.c | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/myisammrg/myrg_rkey.c b/myisammrg/myrg_rkey.c index c907701d50d..6560380622a 100644 --- a/myisammrg/myrg_rkey.c +++ b/myisammrg/myrg_rkey.c @@ -63,7 +63,9 @@ int myrg_rkey(MYRG_INFO *info,byte *record,int inx, const byte *key, } else { - err=_mi_rkey(mi,buf,inx,key_buff,pack_key_length,search_flag,FALSE); + mi->use_packed_key=1; + err=mi_rkey(mi,buf,inx,key_buff,pack_key_length,search_flag); + mi->use_packed_key=0; } info->last_used_table=table+1; diff --git a/myisammrg/myrg_rnext.c b/myisammrg/myrg_rnext.c index 104a94a6f91..d5bc9c54339 100644 --- a/myisammrg/myrg_rnext.c +++ b/myisammrg/myrg_rnext.c @@ -68,8 +68,10 @@ int _myrg_finish_scan(MYRG_INFO *info, int inx, enum ha_rkey_function type) for (; table < info->end_table ; table++) { mi=table->table; - if ((err=_mi_rkey(mi,NULL,inx,key_buff,pack_key_length, - type,FALSE))) + mi->use_packed_key=1; + err=mi_rkey(mi,NULL,inx,key_buff,pack_key_length,type); + mi->use_packed_key=0; + if (err) { if (err == HA_ERR_KEY_NOT_FOUND) /* If end of file */ continue; |