← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/heap/hp_hash.c

  • Committer: Monty Taylor
  • Date: 2009-03-19 18:43:15 UTC
  • mfrom: (937.2.9 sparc)
  • mto: (950.1.1 mordred)
  • mto: This revision was merged to the branch mainline in revision 945.
  • Revision ID: mordred@inaugust.com-20090319184315-qsnstre015btk0oq
Merged from Stewart.

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/heap/hp_hash.c
320
320
      {
321
321
        char_length= my_charpos(cs, pos, pos + char_length,
322
322
                                char_length / cs->mbmaxlen);
323
 
        set_if_smaller(char_length, seg->length); /* QQ: ok to remove? */
 
323
        set_if_smaller(char_length, (uint32_t)seg->length); /* QQ: ok to remove? */
324
324
      }
325
325
      cs->coll->hash_sort(cs, pos, char_length, &nr, &nr2);
326
326
    }
514
514
      {
515
515
        uint32_t char_length= seg->length / cs->mbmaxlen;
516
516
        char_length1= my_charpos(cs, pos1, pos1 + seg->length, char_length);
517
 
        set_if_smaller(char_length1, seg->length);
 
517
        set_if_smaller(char_length1, (uint32_t)seg->length);
518
518
        char_length2= my_charpos(cs, pos2, pos2 + seg->length, char_length);
519
 
        set_if_smaller(char_length2, seg->length);
 
519
        set_if_smaller(char_length2, (uint32_t)seg->length);
520
520
      }
521
521
      else
522
522
      {
606
606
      {
607
607
        uint32_t char_length= seg->length / cs->mbmaxlen;
608
608
        char_length_key= my_charpos(cs, key, key + seg->length, char_length);
609
 
        set_if_smaller(char_length_key, seg->length);
 
609
        set_if_smaller(char_length_key, (uint32_t)seg->length);
610
610
        char_length_rec= my_charpos(cs, pos, pos + seg->length, char_length);
611
 
        set_if_smaller(char_length_rec, seg->length);
 
611
        set_if_smaller(char_length_rec, (uint32_t)seg->length);
612
612
      }
613
613
      else
614
614
      {
674
674
    {
675
675
      char_length= my_charpos(cs, pos, pos + seg->length,
676
676
                              char_length / cs->mbmaxlen);
677
 
      set_if_smaller(char_length, seg->length); /* QQ: ok to remove? */
 
677
      set_if_smaller(char_length, (uint32_t)seg->length); /* QQ: ok to remove? */
678
678
    }
679
679
    if (seg->type == HA_KEYTYPE_VARTEXT1)
680
680
      char_length+= seg->bit_start;             /* Copy also length */
768
768
      char_length= my_charpos(seg->charset,
769
769
                              rec + seg->start, rec + seg->start + char_length,
770
770
                              char_length / seg->charset->mbmaxlen);
771
 
      set_if_smaller(char_length, seg->length); /* QQ: ok to remove? */
 
771
      set_if_smaller(char_length, (uint32_t)seg->length); /* QQ: ok to remove? */
772
772
      if (char_length < seg->length)
773
773
        seg->charset->cset->fill(seg->charset, (char*) key + char_length,
774
774
                                 seg->length - char_length, ' ');
829
829
    {
830
830
      char_length= my_charpos(seg->charset, old, old+char_length,
831
831
                              char_length / seg->charset->mbmaxlen);
832
 
      set_if_smaller(char_length, seg->length); /* QQ: ok to remove? */
 
832
      set_if_smaller(char_length, (uint32_t)seg->length); /* QQ: ok to remove? */
833
833
      if (char_length < seg->length)
834
834
        seg->charset->cset->fill(seg->charset, (char*) key + char_length,
835
835
                                 seg->length - char_length, ' ');