Commit ad019543 authored by unknown's avatar unknown
Browse files

Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ 

into serg.mylan:/usr/home/serg/Abk/mysql-4.1
parents ef0e1c05 5d7c76aa

myisam/myisam_ftdump.c

+89 −99
Original line number Diff line number Diff line
@@ -44,10 +44,6 @@ static struct my_option my_long_options[] = 
   0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},

  {"length", 'l', "Report length distribution.",

   0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},

#ifdef DISABLED

  {"execute", 'e', "Execute given query.", (gptr*) &query, (gptr*) &query, 0,

   GET_STR_ALLOC, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},

#endif

  {"help", 'h', "Display help and exit.",

   0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},

  {"help", '?', "Synonym for -h.",
@@ -108,31 +104,6 @@ int main(int argc,char *argv[]) 


  mi_lock_database(info, F_EXTRA_LCK);



  if (query)

  {

#if 0

    FT_DOCLIST *result;

    int i;



    ft_init_stopwords(ft_precompiled_stopwords);



    result=ft_nlq_init_search(info,inx,query,strlen(query),1);

    if(!result)

      goto err;



    if (verbose)

      printf("%d rows matched\n",result->ndocs);



    for(i=0 ; i<result->ndocs ; i++)

      printf("%9lx %20.7f\n",(ulong)result->doc[i].dpos,result->doc[i].weight);



    ft_nlq_close_search(result);

#else

    printf("-e option is disabled\n");

#endif

  }

  else

  {

  info->lastpos= HA_OFFSET_ERROR;

  info->update|= HA_STATE_PREV_FOUND;
@@ -193,6 +164,29 @@ int main(int argc,char *argv[]) 
  }

  mi_lock_database(info, F_UNLCK);



  if (count || stats)

  {

    doc_cnt++;

    if (*buf2)

    {

      uniq++;

      avg_gws+=gws=GWS_IN_USE;

      if (count)

        printf("%9u %20.7f %s\n",doc_cnt,gws,buf2);

      if (maxlen<keylen2)

      {

        maxlen=keylen2;

        strmov(buf_maxlen, buf2);

      }

      if (max_doc_cnt < doc_cnt)

      {

        max_doc_cnt=doc_cnt;

        strmov(buf_min_gws, buf2);

        min_gws=gws;

      }

    }

  }



  if (stats)

  {

    count=0;
@@ -222,7 +216,6 @@ int main(int argc,char *argv[]) 
               100.0*count/total);

    }

  }

  }



err:

  if (error && error != HA_ERR_END_OF_FILE)
@@ -254,9 +247,6 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), 
    lstats=1;

    complain(query!=0);

    break;

  case 'e':

    complain(dump || count || stats);

    break;

  case '?':

  case 'h':

    usage();