MATCH ... AGAINST ("..." WITH QUERY EXPANSION) syntax

myisam/mi_write.c:
  cleanup
mysql-test/t/fulltext.test:
  after merge fix

5 files changed, 11 insertions, 11 deletions

diff --git a/myisam/ft_boolean_search.c b/myisam/ft_boolean_search.c
index 0b97eded872..bb9c2624691 100644
--- a/myisam/ft_boolean_search.c
+++ b/myisam/ft_boolean_search.c
@@ -341,7 +341,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,
-				 my_bool presort __attribute__((unused)))
+				 uint flags __attribute__((unused)))
 {
   FTB       *ftb;
   FTB_EXPR  *ftbe;
diff --git a/myisam/ft_nlq_search.c b/myisam/ft_nlq_search.c
index 690ad0fc453..efe735c3d16 100644
--- a/myisam/ft_nlq_search.c
+++ b/myisam/ft_nlq_search.c
@@ -175,7 +175,7 @@ static int FT_DOC_cmp(FT_DOC *a, FT_DOC *b)
 
 
 FT_INFO *ft_init_nlq_search(MI_INFO *info, uint keynr, byte *query,
-			    uint query_len, my_bool presort)
+			    uint query_len, uint flags)
 {
   TREE	     allocated_wtree, *wtree=&allocated_wtree;
   ALL_IN_ONE  aio;
@@ -224,7 +224,7 @@ FT_INFO *ft_init_nlq_search(MI_INFO *info, uint keynr, byte *query,
   tree_walk(&aio.dtree, (tree_walk_action) &walk_and_copy,
 	    &dptr, left_root_right);
 
-  if (presort)
+  if (flags & FT_SORTED)
     qsort(dlist->doc, dlist->ndocs, sizeof(FT_DOC), (qsort_cmp)&FT_DOC_cmp);
 
 err2:
diff --git a/myisam/ft_static.c b/myisam/ft_static.c
index 44e80847fd7..ca3054ae977 100644
--- a/myisam/ft_static.c
+++ b/myisam/ft_static.c
@@ -53,14 +53,14 @@ const struct _ft_vft _ft_vft_boolean = {
   ft_boolean_get_relevance,  ft_boolean_reinit_search
 };
 
-FT_INFO *(*_ft_init_vft[2])(MI_INFO *, uint, byte *, uint, my_bool) =
+FT_INFO *(*_ft_init_vft[2])(MI_INFO *, uint, byte *, uint, uint) =
 { ft_init_nlq_search, ft_init_boolean_search };
 
-FT_INFO *ft_init_search(uint mode, void *info, uint keynr,
-    byte *query, uint query_len, my_bool presort)
+FT_INFO *ft_init_search(uint flags, void *info, uint keynr,
+                        byte *query, uint query_len)
 {
-  return (*_ft_init_vft[mode])((MI_INFO *)info, keynr,
-          query, query_len, presort);
+  return (*_ft_init_vft[ flags&1 ])((MI_INFO *)info, keynr,
+          query, query_len, flags);
 }
 
 const char *ft_stopword_file = 0;
diff --git a/myisam/ftdefs.h b/myisam/ftdefs.h
index 6e71f20e17c..2079a60f47d 100644
--- a/myisam/ftdefs.h
+++ b/myisam/ftdefs.h
@@ -128,7 +128,7 @@ FT_WORD * _mi_ft_parserecord(MI_INFO *, uint, const byte *);
 uint _mi_ft_parse(TREE *parsed, MI_INFO *info, uint keynr, const byte *record);
 
 extern const struct _ft_vft _ft_vft_nlq;
-FT_INFO *ft_init_nlq_search(MI_INFO *, uint, byte *, uint, my_bool);
+FT_INFO *ft_init_nlq_search(MI_INFO *, uint, byte *, uint, uint);
 int ft_nlq_read_next(FT_INFO *, char *);
 float ft_nlq_find_relevance(FT_INFO *, byte *, uint);
 void ft_nlq_close_search(FT_INFO *);
@@ -137,7 +137,7 @@ my_off_t ft_nlq_get_docid(FT_INFO *);
 void ft_nlq_reinit_search(FT_INFO *);
 
 extern const struct _ft_vft _ft_vft_boolean;
-FT_INFO *ft_init_boolean_search(MI_INFO *, uint, byte *, uint, my_bool);
+FT_INFO *ft_init_boolean_search(MI_INFO *, uint, byte *, uint, uint);
 int ft_boolean_read_next(FT_INFO *, char *);
 float ft_boolean_find_relevance(FT_INFO *, byte *, uint);
 void ft_boolean_close_search(FT_INFO *);
diff --git a/myisam/mi_write.c b/myisam/mi_write.c
index b6a7bf50dd0..155cf998a33 100644
--- a/myisam/mi_write.c
+++ b/myisam/mi_write.c
@@ -272,7 +272,7 @@ int _mi_ck_write_btree(register MI_INFO *info, uint keynr, uchar *key,
     if (!error)
       error= _mi_ft_convert_to_ft2(info, keynr, key);
     delete_dynamic(info->ft1_to_ft2);
-    my_free(info->ft1_to_ft2, MYF(0));
+    my_free((gptr)info->ft1_to_ft2, MYF(0));
     info->ft1_to_ft2=0;
   }
   DBUG_RETURN(error);