← Back to branch summary

~mdcallag/+junk/5.1-map

« back to all changes in this revision

Viewing changes to storage/myisammrg/myrg_rkey.c

  • Committer: msvensson at pilot
  • Date: 2007-04-24 09:11:45 UTC
  • mfrom: (2469.1.106)
  • Revision ID: sp1r-msvensson@pilot.blaudden-20070424091145-10463
Merge pilot.blaudden:/home/msvensson/mysql/my51-m-mysql_upgrade
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/myisammrg/myrg_rkey.c
36
36
*/
37
37
 
38
38
int myrg_rkey(MYRG_INFO *info,byte *buf,int inx, const byte *key,
39
 
            uint key_len, enum ha_rkey_function search_flag)
 
39
            key_part_map keypart_map, enum ha_rkey_function search_flag)
40
40
{
41
41
  byte *key_buff;
42
42
  uint pack_key_length;
56
56
 
57
57
    if (table == info->open_tables)
58
58
    {
59
 
      err=mi_rkey(mi,0,inx,key,key_len,search_flag);
 
59
      err=mi_rkey(mi, 0, inx, key, keypart_map, search_flag);
60
60
      /* Get the saved packed key and packed key length. */
61
61
      key_buff=(byte*) mi->lastkey+mi->s->base.max_key_length;
62
62
      pack_key_length=mi->pack_key_length;
64
64
    else
65
65
    {
66
66
      mi->once_flags|= USE_PACKED_KEYS;
67
 
      err=mi_rkey(mi,0,inx,key_buff,pack_key_length,search_flag);
 
67
      err=mi_rkey(mi, 0, inx, key_buff, pack_key_length, search_flag);
68
68
    }
69
69
    info->last_used_table=table+1;
70
70