Revert "Fix build error on MySQL 5.6.36 and MySQL 5.7.18"

This reverts commit 4afbace. This change is not correct way to fix the issue.
mroonga · Apr 13, 2017 · 26ceab6 · 26ceab6
1 parent 4afbace
commit 26ceab6
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 9 deletions.
diff --git a/ha_mroonga.cpp b/ha_mroonga.cpp
@@ -4287,9 +4287,7 @@ void ha_mroonga::wrapper_overwrite_index_bits()
   {
     Field *field = table_share->field[i];
     field->part_of_key.clear_all();
-#ifdef MRN_HAVE_MYSQL_FIELD_PART_OF_KEY_NOT_CLUSTERED
     field->part_of_key_not_clustered.clear_all();
-#endif
     field->part_of_sortkey.clear_all();
   }
   for (i = 0; i < table_share->keys; i++) {
@@ -4305,9 +4303,7 @@ void ha_mroonga::wrapper_overwrite_index_bits()
         {
           table_share->keys_for_keyread.set_bit(i);
           field->part_of_key.set_bit(i);
-#ifdef MRN_HAVE_MYSQL_FIELD_PART_OF_KEY_NOT_CLUSTERED
           field->part_of_key_not_clustered.set_bit(i);
-#endif
         }
         if (index_flags(i, j, 1) & HA_READ_ORDER)
           field->part_of_sortkey.set_bit(i);

diff --git a/mrn_mysql_compat.h b/mrn_mysql_compat.h
@@ -351,9 +351,4 @@
   (c == FN_LIBCHAR || c == FN_LIBCHAR2)
 #endif
 
-#if ((MYSQL_VERSION_ID < 50636) || \
-    (MYSQL_VERSION_ID >= 50700 && MYSQL_VERSION_ID < 50718)) && !defined(MRN_MARIADB_P)
-#  define MRN_HAVE_MYSQL_FIELD_PART_OF_KEY_NOT_CLUSTERED
-#endif
-
 #endif /* MRN_MYSQL_COMPAT_H_ */