Commit 0c94c1de authored by serg@serg.mysql.com's avatar serg@serg.mysql.com
Browse files

Merge

parents c39d20ff d0162c3a

sql/item_func.cc

+1 −1
Original line number Diff line number Diff line
@@ -1988,7 +1988,7 @@ bool Item_func_match::fix_index() 
      ft_to_key[mkeys]=ft_to_key[key];

      continue;

    }

    if (ft_cnt[key] == max_cnt)

    if (max_cnt && ft_cnt[key] == max_cnt)

    {

      mkeys++;

      ft_cnt[mkeys]=ft_cnt[key];