Kentaro Hayashi
null+****@clear*****
Thu Apr 13 17:13:26 JST 2017
Kentaro Hayashi 2017-04-13 17:13:26 +0900 (Thu, 13 Apr 2017) New Revision: 26ceab65e825e2e52f6036bdb32cd7588014e48b https://github.com/mroonga/mroonga/commit/26ceab65e825e2e52f6036bdb32cd7588014e48b Message: Revert "Fix build error on MySQL 5.6.36 and MySQL 5.7.18" This reverts commit 4afbace5f741dc2cb5a966bf1108f8fe2317ea85. This change is not correct way to fix the issue. Modified files: ha_mroonga.cpp mrn_mysql_compat.h Modified: ha_mroonga.cpp (+0 -4) =================================================================== --- ha_mroonga.cpp 2017-04-13 16:57:05 +0900 (9cab427) +++ ha_mroonga.cpp 2017-04-13 17:13:26 +0900 (6e7a9d3) @@ -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); Modified: mrn_mysql_compat.h (+0 -5) =================================================================== --- mrn_mysql_compat.h 2017-04-13 16:57:05 +0900 (65122f2) +++ mrn_mysql_compat.h 2017-04-13 17:13:26 +0900 (4891b67) @@ -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_ */ -------------- next part -------------- HTML����������������������������...Download
