← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/myisam/mi_search.c

  • Committer: Toru Maesaka
  • Date: 2008-12-02 08:02:52 UTC
  • mfrom: (636 drizzle)
  • mto: (632.1.17 devel)
  • mto: This revision was merged to the branch mainline in revision 637.
  • Revision ID: dev@torum.net-20081202080252-26spgq2s17np0b2m
Merge from trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/myisam/mi_search.c
805
805
        }
806
806
        else if (tot_length < 255 && *start == 255)
807
807
        {
808
 
          memcpy(key+1,key+3,length);
 
808
          memmove(key+1,key+3,length);
809
809
          *key=tot_length;
810
810
          key+=1+length;
811
811
        }
861
861
    page+=length;
862
862
  }
863
863
  length=keyseg->length+nod_flag;
864
 
  memcpy(key,page,length);
 
864
  memmove(key,page,length);
865
865
  *page_pos= page+length;
866
866
  return ((uint) (key-start_key)+keyseg->length);
867
867
} /* _mi_get_pack_key */
1004
1004
  nod_flag=mi_test_if_nod(page);
1005
1005
  if (! (keyinfo->flag & (HA_VAR_LENGTH_KEY | HA_BINARY_PACK_KEY)))
1006
1006
  {
1007
 
    memcpy(key,keypos,keyinfo->keylength+nod_flag);
 
1007
    memmove(key,keypos,keyinfo->keylength+nod_flag);
1008
1008
    return(keypos+keyinfo->keylength+nod_flag);
1009
1009
  }
1010
1010
  else
1039
1039
  if (! (keyinfo->flag & (HA_VAR_LENGTH_KEY | HA_BINARY_PACK_KEY)))
1040
1040
  {
1041
1041
    *return_key_length=keyinfo->keylength;
1042
 
    memcpy(key, keypos - *return_key_length-nod_flag, *return_key_length);
 
1042
    memmove(key, keypos - *return_key_length-nod_flag, *return_key_length);
1043
1043
    return(0);
1044
1044
  }
1045
1045
  else
1077
1077
    lastpos=endpos-keyinfo->keylength-nod_flag;
1078
1078
    *return_key_length=keyinfo->keylength;
1079
1079
    if (lastpos > page)
1080
 
      memcpy(lastkey,lastpos,keyinfo->keylength+nod_flag);
 
1080
      memmove(lastkey,lastpos,keyinfo->keylength+nod_flag);
1081
1081
  }
1082
1082
  else
1083
1083
  {
1781
1781
  }
1782
1782
  assert(key_pos >= start);
1783
1783
  length= s_temp->totlength - (key_pos - start);
1784
 
  memcpy(key_pos, s_temp->key, length);
 
1784
  memmove(key_pos, s_temp->key, length);
1785
1785
 
1786
1786
  if (!s_temp->next_key_pos)                    /* No following key */
1787
1787
    return;