Commit 392315df authored by serg@serg.mysql.com's avatar serg@serg.mysql.com
Browse files

I have to commit to be able to pull

parent c4229a8d

include/ft_global.h

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ extern "C" { 
typedef struct st_ft_info FT_INFO;

struct _ft_vft {

  int       (*read_next)(FT_INFO *, char *);

  float     (*find_relevance)(FT_INFO *, my_off_t);

  float     (*find_relevance)(FT_INFO *, my_off_t, byte *);

  void      (*close_search)(FT_INFO *);

  float     (*get_relevance)(FT_INFO *);

  my_off_t  (*get_docid)(FT_INFO *);

myisam/ft_boolean_search.c

+2 −2
Original line number Diff line number Diff line
@@ -321,9 +321,9 @@ int ft_boolean_read_next(FT_INFO *ftb, char *record) 
  return my_errno=HA_ERR_END_OF_FILE;

}



float ft_boolean_find_relevance(FT_INFO *ftb, my_off_t docid)

float ft_boolean_find_relevance(FT_INFO *ftb,

    my_off_t docid __attribute__((unused)), byte *record)

{

  fprintf(stderr, "ft_boolean_find_relevance called!\n");

  return -1.0; /* to be done via str scan */

}

myisam/ft_nlq_search.c

+2 −1
Original line number Diff line number Diff line
@@ -247,7 +247,8 @@ int ft_nlq_read_next(FT_INFO *handler, char *record) 
  return my_errno;

}



float ft_nlq_find_relevance(FT_INFO *handler, my_off_t docid)

float ft_nlq_find_relevance(FT_INFO *handler, my_off_t docid,

    byte *record __attribute__((unused)))

{

  int a,b,c;

  FT_DOC  *docs=handler->doc;

myisam/ftdefs.h

+2 −2
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ FT_WORD * _mi_ft_parserecord(MI_INFO *, uint , byte *, const byte *); 
const struct _ft_vft _ft_vft_nlq;

FT_INFO *ft_init_nlq_search(MI_INFO *, uint, byte *, uint, my_bool);

int ft_nlq_read_next(FT_INFO *, char *);

float ft_nlq_find_relevance(FT_INFO *, my_off_t );

float ft_nlq_find_relevance(FT_INFO *, my_off_t, byte *);

void ft_nlq_close_search(FT_INFO *);

float ft_nlq_get_relevance(FT_INFO *);

my_off_t ft_nlq_get_docid(FT_INFO *);
@@ -135,7 +135,7 @@ void ft_nlq_reinit_search(FT_INFO *); 
const struct _ft_vft _ft_vft_boolean;

FT_INFO *ft_init_boolean_search(MI_INFO *, uint, byte *, uint, my_bool);

int ft_boolean_read_next(FT_INFO *, char *);

float ft_boolean_find_relevance(FT_INFO *, my_off_t );

float ft_boolean_find_relevance(FT_INFO *, my_off_t, byte *);

void ft_boolean_close_search(FT_INFO *);

float ft_boolean_get_relevance(FT_INFO *);

my_off_t ft_boolean_get_docid(FT_INFO *);

sql/item_func.cc

+8 −6
Original line number Diff line number Diff line
@@ -2065,6 +2065,7 @@ bool Item_func_match::fix_fields(THD *thd,struct st_table_list *tlist) 
  }

  const_item_cache=0;

  table=((Item_field *)fields.head())->field->table;

  record=table->record[0];

  return 0;

}
@@ -2160,7 +2161,6 @@ bool Item_func_match::eq(const Item *item) const 
  return 0;

}



#if 0

double Item_func_match::val()

{

  if (ft_handler==NULL)
@@ -2182,10 +2182,10 @@ double Item_func_match::val() 
  if ((null_value=(docid==HA_OFFSET_ERROR)))

    return 0.0;

  else

    return ft_handler->please->find_relevance(ft_handler, docid);

    return ft_handler->please->find_relevance(ft_handler, docid, record);

}

#endif



#if 0

double Item_func_match_nl::val()

{

  if (ft_handler==NULL)
@@ -2207,7 +2207,7 @@ double Item_func_match_nl::val() 
  if ((null_value=(docid==HA_OFFSET_ERROR)))

    return 0.0;

  else

    return ft_handler->please->find_relevance(ft_handler, docid);

    return ft_handler->please->find_relevance(ft_handler, docid, record);

}



double Item_func_match_bool::val()
@@ -2226,9 +2226,11 @@ double Item_func_match_bool::val() 
    join_key=0;

  }



  null_value=1;

  return -1.0;

  return ft_handler->please->find_relevance(ft_handler, docid, record);

  //null_value=1;

  //return -1.0;

}

#endif



/***************************************************************************

  System variables