Push a lot of small fixes to get larger parts to compile

1 files changed, 2 insertions, 2 deletions

diff --git a/sql/item_func.cc b/sql/item_func.cc
index 1692f2b3d89..a8631093f3e 100644
--- a/sql/item_func.cc
+++ b/sql/item_func.cc
@@ -6171,7 +6171,7 @@ bool Item_func_match::fix_index()
     for (keynr=0 ; keynr < fts ; keynr++)
     {
       KEY *ft_key=&table->key_info[ft_to_key[keynr]];
-      uint key_parts=ft_key->key_parts;
+      uint key_parts=ft_key->user_defined_key_parts;
 
       for (uint part=0 ; part < key_parts ; part++)
       {
@@ -6203,7 +6203,7 @@ bool Item_func_match::fix_index()
   {
     // partial keys doesn't work
     if (max_cnt < arg_count-1 ||
-        max_cnt < table->key_info[ft_to_key[keynr]].key_parts)
+        max_cnt < table->key_info[ft_to_key[keynr]].user_defined_key_parts)
       continue;
 
     key=ft_to_key[keynr];