Merge branch 'github/10.0' into 10.1

1 files changed, 10 insertions, 1 deletions

diff --git a/sql/sql_base.cc b/sql/sql_base.cc
index d3d33e04d00..01f40bb2247 100644
--- a/sql/sql_base.cc
+++ b/sql/sql_base.cc
@@ -9215,7 +9215,16 @@ int init_ftfuncs(THD *thd, SELECT_LEX *select_lex, bool no_order)
     DBUG_PRINT("info",("Performing FULLTEXT search"));
 
     while ((ifm=li++))
-      ifm->init_search(thd, no_order);
+#if MYSQL_VERSION_ID < 100213
+      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
+#endif
+        ifm->init_search(thd, no_order);
   }
   return 0;
 }