Commit 2f51cf20 authored by serg@serg.mysql.com's avatar serg@serg.mysql.com
Browse files

Merge work:/home/bk/mysql-4.0 

into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
parents 316126bf 7a7f94d8

myisam/mi_check.c

+2 −1
Original line number Diff line number Diff line
@@ -2116,7 +2116,7 @@ static int sort_ft_key_read(SORT_INFO *sort_info, void *key) 
{

  int error;

  MI_INFO *info;

  FT_WORD *wptr;

  FT_WORD *wptr=0;

  DBUG_ENTER("sort_ft_key_read");



  info=sort_info->info;
@@ -2125,6 +2125,7 @@ static int sort_ft_key_read(SORT_INFO *sort_info, void *key) 
  {

    do

    {

      my_free((char*) wptr, MYF(MY_ALLOW_ZERO_PTR));

      if ((error=sort_get_next_record(sort_info)))

        DBUG_RETURN(error);

      if (!(wptr=_mi_ft_parserecord(info,sort_info->key,key,sort_info->record)))