Kouhei Sutou
null+****@clear*****
Sun Dec 24 01:42:55 JST 2017
Kouhei Sutou 2017-12-24 01:42:55 +0900 (Sun, 24 Dec 2017) New Revision: 20da0abf72df7b96a9b6cb65e22a3338c1775b74 https://github.com/mroonga/mroonga/commit/20da0abf72df7b96a9b6cb65e22a3338c1775b74 Message: Fix build errors Modified files: ha_mroonga.cpp mrn_mysql_compat.h Modified: ha_mroonga.cpp (+5 -1) =================================================================== --- ha_mroonga.cpp 2017-12-24 01:39:00 +0900 (82f2b267) +++ ha_mroonga.cpp 2017-12-24 01:42:55 +0900 (c6a2e90b) @@ -11599,9 +11599,9 @@ void ha_mroonga::storage_store_field(Field *field, break; #ifdef MRN_HAVE_MYSQL_TYPE_BLOB_COMPRESSED case MYSQL_TYPE_BLOB_COMPRESSED: -#endif storage_store_field_blob_compressed(field, value, value_length); break; +#endif case MYSQL_TYPE_VAR_STRING: case MYSQL_TYPE_STRING: storage_store_field_string(field, value, value_length); @@ -12191,7 +12191,11 @@ int ha_mroonga::storage_encode_key_set(Field *field, const uchar *key, (uchar *)(key - 1), field->null_bit, field->unireg_check, +#ifdef MRN_FIELD_SET_USE_LEX_STRING &(field->field_name), +#else + field->field_name, +#endif field->pack_length(), static_cast<Field_set*>(field)->typelib, static_cast<Field_set*>(field)->charset()); Modified: mrn_mysql_compat.h (+1 -0) =================================================================== --- mrn_mysql_compat.h 2017-12-24 01:39:00 +0900 (54baa5c3) +++ mrn_mysql_compat.h 2017-12-24 01:42:55 +0900 (8572cc7b) @@ -78,6 +78,7 @@ #if MYSQL_VERSION_ID >= 100302 && defined(MRN_MARIADB_P) # define MRN_KEY_NAME_IS_LEX_STRING # define MRN_FIELD_FIELD_NAME_IS_LEX_STRING +# define MRN_FIELD_SET_USE_LEX_STRING #endif #ifdef MRN_KEY_NAME_IS_LEX_STRING -------------- next part -------------- HTML����������������������������... URL: https://lists.osdn.me/mailman/archives/groonga-mysql-commit/attachments/20171224/73a9acfa/attachment-0001.htm
