Commit 1be345ed authored by unknown's avatar unknown
Browse files

Merge changes 


client/mysqlcheck.c:
  Auto merged
myisam/ft_boolean_search.c:
  Auto merged
myisam/ft_static.c:
  Auto merged
mysql-test/r/func_group.result:
  Auto merged
mysql-test/r/union.result:
  Auto merged
mysql-test/t/func_group.test:
  Auto merged
mysql-test/t/multi_update.test:
  Auto merged
mysql-test/t/union.test:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/ha_myisam.h:
  Auto merged
sql/handler.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
sql/field.cc:
  Clean up merge
parents 74ad9e8f 2f911184

client/mysqlcheck.c

+1 −1
Original line number Diff line number Diff line
@@ -195,7 +195,7 @@ static void usage(void) 
  puts("and you are welcome to modify and redistribute it under the GPL license.\n");

  puts("This program can be used to CHECK (-c,-m,-C), REPAIR (-r), ANALYZE (-a)");

  puts("or OPTIMIZE (-o) tables. Some of the options (like -e or -q) can be");

  puts("used at the same time. It works on MyISAM and in some cases on BDB tables.");

  puts("used at the same time. Not all options are supported by all storage engines.");

  puts("Please consult the MySQL manual for latest information about the");

  puts("above. The options -c,-r,-a and -o are exclusive to each other, which");

  puts("means that the last option will be used, if several was specified.\n");

include/ft_global.h

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ void ft_free_stopwords(void); 
#define FT_SORTED 2

#define FT_EXPAND 4   /* query expansion */



FT_INFO *ft_init_search(uint,void *, uint, byte *, uint, byte *);

FT_INFO *ft_init_search(uint,void *, uint, byte *, uint,CHARSET_INFO *, byte *);

my_bool ft_boolean_check_syntax_string(const byte *);



#ifdef  __cplusplus

myisam/ft_boolean_search.c

+4 −3
Original line number Diff line number Diff line
@@ -366,6 +366,7 @@ static void _ftb_init_index_search(FT_INFO *ftb) 
        reset_tree(& ftb->no_dupes);

    }



    ftbw->off=0; /* in case of reinit */

    if (_ft2_search(ftb, ftbw, 1))

      return;

  }
@@ -374,7 +375,7 @@ static void _ftb_init_index_search(FT_INFO *ftb) 




FT_INFO * ft_init_boolean_search(MI_INFO *info, uint keynr, byte *query,

                                 uint query_len)

                                 uint query_len, CHARSET_INFO *cs)

{

  FTB       *ftb;

  FTB_EXPR  *ftbe;
@@ -386,8 +387,8 @@ FT_INFO * ft_init_boolean_search(MI_INFO *info, uint keynr, byte *query, 
  ftb->state=UNINITIALIZED;

  ftb->info=info;

  ftb->keynr=keynr;

  ftb->charset= ((keynr==NO_SUCH_KEY) ?

           default_charset_info : info->s->keyinfo[keynr].seg->charset);

  ftb->charset=cs;

  DBUG_ASSERT(keynr==NO_SUCH_KEY || cs == info->s->keyinfo[keynr].seg->charset);

  ftb->with_scan=0;

  ftb->lastpos=HA_OFFSET_ERROR;

  bzero(& ftb->no_dupes, sizeof(TREE));

myisam/ft_static.c

+3 −2
Original line number Diff line number Diff line
@@ -57,11 +57,12 @@ const struct _ft_vft _ft_vft_boolean = { 




FT_INFO *ft_init_search(uint flags, void *info, uint keynr,

                        byte *query, uint query_len, byte *record)

                        byte *query, uint query_len, CHARSET_INFO *cs,

                        byte *record)

{

  FT_INFO *res;

  if (flags & FT_BOOL)

    res= ft_init_boolean_search((MI_INFO *)info, keynr, query, query_len);

    res= ft_init_boolean_search((MI_INFO *)info, keynr, query, query_len,cs);

  else

    res= ft_init_nlq_search((MI_INFO *)info, keynr, query, query_len, flags,

			    record);

myisam/ftdefs.h

+1 −1
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ FT_WORD * _mi_ft_parserecord(MI_INFO *, uint, const byte *); 
uint _mi_ft_parse(TREE *, MI_INFO *, uint, const byte *, my_bool);



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

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

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



extern const struct _ft_vft _ft_vft_nlq;

int ft_nlq_read_next(FT_INFO *, char *);