← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/heap/hp_hash.c

  • Committer: Brian Aker
  • Date: 2008-08-05 04:10:42 UTC
  • mfrom: (261.2.8 codestyle)
  • mto: This revision was merged to the branch mainline in revision 263.
  • Revision ID: brian@tangent.org-20080805041042-1l4893r3bwy2lxz2
Merge from Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/heap/hp_hash.c
755
755
      set_if_smaller(length,tmp_length);
756
756
      FIX_LENGTH(cs, pos, length, char_length);
757
757
      store_key_length_inc(key,char_length);
758
 
      memcpy((uchar*) key,(uchar*) pos,(size_t) char_length);
 
758
      memcpy(key,pos,(size_t) char_length);
759
759
      key+= char_length;
760
760
      continue;
761
761
    }
818
818
      set_if_smaller(length,tmp_length);        /* Safety */
819
819
      FIX_LENGTH(cs, old, length, char_length);
820
820
      store_key_length_inc(key,char_length);
821
 
      memcpy((uchar*) key, old,(size_t) char_length);
 
821
      memcpy(key, old,(size_t) char_length);
822
822
      key+= char_length;
823
823
      continue;
824
824
    }