Merge bb-10.2-ext into 10.3

1 files changed, 8 insertions, 2 deletions

diff --git a/sql/sql_base.cc b/sql/sql_base.cc
index c46a825f9d7..3e1d5ffd63a 100644
--- a/sql/sql_base.cc
+++ b/sql/sql_base.cc
@@ -8600,8 +8600,14 @@ int init_ftfuncs(THD *thd, SELECT_LEX *select_lex, bool no_order)
     Item_func_match *ifm;
 
     while ((ifm=li++))
-      if (ifm->init_search(thd, no_order))
-        return 1;
+      if (unlikely(!ifm->fixed))
+        /*
+          it mean that clause where was FT function was removed, so we have
+          to remove the function from the list.
+        */
+        li.remove();
+      else if (ifm->init_search(thd, no_order))
+	return 1;
   }
   return 0;
 }