1 files changed, 7 insertions, 0 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc
index b047258818b..2fa9b35db9e 100644
--- a/sql/item_func.cc
+++ b/sql/item_func.cc
@@ -6130,6 +6130,13 @@ bool Item_func_match::fix_index()
   uint ft_to_key[MAX_KEY], ft_cnt[MAX_KEY], fts=0, keynr;
   uint max_cnt=0, mkeys=0, i;
 
+  /*
+    We will skip execution if the item is not fixed
+    with fix_field
+  */
+  if (!fixed)
+    return false;
+
   if (key == NO_SUCH_KEY)
     return 0;