← Back to branch summary

~jlukas79/+junk/mysql-server

« back to all changes in this revision

Viewing changes to storage/myisam/ft_boolean_search.c

manual merge 6.0-main --> 6.0-bka-review

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/myisam/ft_boolean_search.c
162
162
static int FTB_WORD_cmp_list(CHARSET_INFO *cs, FTB_WORD **a, FTB_WORD **b)
163
163
{
164
164
  /* ORDER BY word DESC, ndepth DESC */
165
 
  int i= mi_compare_text(cs, (uchar*) (*b)->word+1,(*b)->len-1,
 
165
  int i= ha_compare_text(cs, (uchar*) (*b)->word+1,(*b)->len-1,
166
166
                             (uchar*) (*a)->word+1,(*a)->len-1,0,0);
167
167
  if (!i)
168
168
    i=CMP_NUM((*b)->ndepth,(*a)->ndepth);
196
196
    case FT_TOKEN_WORD:
197
197
      ftbw= (FTB_WORD *)alloc_root(&ftb_param->ftb->mem_root,
198
198
                                   sizeof(FTB_WORD) +
199
 
                                   (info->trunc ? MI_MAX_KEY_BUFF :
 
199
                                   (info->trunc ? HA_MAX_KEY_BUFF :
200
200
                                    word_len * ftb_param->ftb->charset->mbmaxlen +
201
201
                                    HA_FT_WLEN +
202
202
                                    ftb_param->ftb->info->s->rec_reflength));
344
344
  MI_INFO *info=ftb->info;
345
345
  uint off, extra=HA_FT_WLEN+info->s->base.rec_reflength;
346
346
  uchar *lastkey_buf=ftbw->word+ftbw->off;
347
 
 
348
347
  LINT_INIT(off);
 
348
 
349
349
  if (ftbw->flags & FTB_FLAG_TRUNC)
350
350
    lastkey_buf+=ftbw->len;
351
351
 
395
395
 
396
396
  if (!r && !ftbw->off)
397
397
  {
398
 
    r= mi_compare_text(ftb->charset,
 
398
    r= ha_compare_text(ftb->charset,
399
399
                       info->lastkey+1,
400
400
                       info->lastkey_length-extra-1,
401
401
              (uchar*) ftbw->word+1,
868
868
  for (a= 0, b= ftb->queue.elements, c= (a+b)/2; b-a>1; c= (a+b)/2)
869
869
  {
870
870
    ftbw= ftb->list[c];
871
 
    if (mi_compare_text(ftb->charset, (uchar*)word, len,
 
871
    if (ha_compare_text(ftb->charset, (uchar*)word, len,
872
872
                        (uchar*)ftbw->word+1, ftbw->len-1,
873
873
                        (my_bool)(ftbw->flags&FTB_FLAG_TRUNC), 0) > 0)
874
874
      b= c;
878
878
  for (; c >= 0; c--)
879
879
  {
880
880
    ftbw= ftb->list[c];
881
 
    if (mi_compare_text(ftb->charset, (uchar*)word, len,
 
881
    if (ha_compare_text(ftb->charset, (uchar*)word, len,
882
882
                        (uchar*)ftbw->word + 1,ftbw->len - 1,
883
883
                        (my_bool)(ftbw->flags & FTB_FLAG_TRUNC), 0))
884
884
      break;