Kouhei Sutou
null+****@clear*****
Sun Dec 24 13:22:14 JST 2017
Kouhei Sutou 2017-12-24 13:22:14 +0900 (Sun, 24 Dec 2017) New Revision: 219e7ce76d64bb42002ab22eaf721c34e41946f9 https://github.com/mroonga/mroonga/commit/219e7ce76d64bb42002ab22eaf721c34e41946f9 Message: mariadb10.3: follow Field::field_name type change const char * -> LEX_CSTRING. Now, we can build Mroonga with MariaDB 10.3 but Mroonga doesn't work yet... Modified files: lib/mrn_count_skip_checker.cpp Modified: lib/mrn_count_skip_checker.cpp (+9 -6) =================================================================== --- lib/mrn_count_skip_checker.cpp 2017-12-24 13:21:09 +0900 (2c85517e) +++ lib/mrn_count_skip_checker.cpp 2017-12-24 13:22:14 +0900 (964c479b) @@ -261,9 +261,10 @@ namespace mrn { if (!key_info_) { GRN_LOG(ctx_, GRN_LOG_DEBUG, - "[mroonga][count-skip][false] no active index: <%s>:<%s>", + "[mroonga][count-skip][false] no active index: " + "<%s>:<" FIELD_NAME_FORMAT ">", *(field->table_name), - field->field_name); + FIELD_NAME_FORMAT_VALUE(field)); DBUG_RETURN(false); } @@ -276,20 +277,22 @@ namespace mrn { } else { GRN_LOG(ctx_, GRN_LOG_DEBUG, "[mroonga][count-skip][false] " - "field's index are out of key part map: %u:%lu: <%s>:<%s>", + "field's index are out of key part map: " + "%u:%lu: <%s>:<" FIELD_NAME_FORMAT ">", i, target_key_part_map_, *(field->table_name), - field->field_name); + FIELD_NAME_FORMAT_VALUE(field)); DBUG_RETURN(false); } } } GRN_LOG(ctx_, GRN_LOG_DEBUG, - "[mroonga][count-skip][false] field isn't indexed: <%s>:<%s>", + "[mroonga][count-skip][false] field isn't indexed: " + "<%s>:<" FIELD_NAME_FORMAT ">", *(field->table_name), - field->field_name); + FIELD_NAME_FORMAT_VALUE(field)); DBUG_RETURN(false); } } -------------- next part -------------- HTML����������������������������... URL: https://lists.osdn.me/mailman/archives/groonga-mysql-commit/attachments/20171224/641ff597/attachment-0001.htm
