← Back to branch summary

~jlukas79/+junk/mysql-server

« back to all changes in this revision

Viewing changes to storage/myisam/ft_parser.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_parser.c
31
31
 
32
32
static int FT_WORD_cmp(CHARSET_INFO* cs, FT_WORD *w1, FT_WORD *w2)
33
33
{
34
 
  return mi_compare_text(cs, (uchar*) w1->pos, w1->len,
 
34
  return ha_compare_text(cs, (uchar*) w1->pos, w1->len,
35
35
                         (uchar*) w2->pos, w2->len, 0, 0);
36
36
}
37
37
 
302
302
}
303
303
 
304
304
 
305
 
int ft_parse(TREE *wtree, uchar *doc, int doclen,
 
305
int ft_parse(TREE *wtree, const uchar *doc, int doclen,
306
306
             struct st_mysql_ftparser *parser,
307
307
             MYSQL_FTPARSER_PARAM *param, MEM_ROOT *mem_root)
308
308
{