Kouhei Sutou
null+****@clear*****
Mon Jul 9 12:42:10 JST 2018
Kouhei Sutou 2018-07-09 12:42:10 +0900 (Mon, 09 Jul 2018) New Revision: a0d4ab6c345e029e1ee6eb4ca40c642b49cf7644 https://github.com/mroonga/mroonga/commit/a0d4ab6c345e029e1ee6eb4ca40c642b49cf7644 Message: mysql8: Key_part_spec::field_name is const LEX_CSTRING Modified files: ha_mroonga.cpp mrn_mysql_compat.h Modified: ha_mroonga.cpp (+1 -1) =================================================================== --- ha_mroonga.cpp 2018-07-09 12:39:28 +0900 (2c93b195) +++ ha_mroonga.cpp 2018-07-09 12:42:10 +0900 (aeed9777) @@ -4042,7 +4042,7 @@ bool ha_mroonga::storage_create_foreign_key(TABLE *table, { bool is_same_field_name = false; MRN_KEY_PART_SPEC_LIST_EACH_BEGIN(key_spec->columns, key_part_spec) { - mrn_key_part_spec_field_name *field_name = + const mrn_key_part_spec_field_name *field_name = &(key_part_spec->field_name); DBUG_PRINT("info", ("mroonga: field_name=%.*s", static_cast<int>(field_name->length), Modified: mrn_mysql_compat.h (+2 -1) =================================================================== --- mrn_mysql_compat.h 2018-07-09 12:39:28 +0900 (96c0c9b5) +++ mrn_mysql_compat.h 2018-07-09 12:42:10 +0900 (d0eb3497) @@ -144,7 +144,8 @@ # define FIELD_NAME_FORMAT_VALUE(field) (field)->field_name #endif -#if MYSQL_VERSION_ID >= 100302 && defined(MRN_MARIADB_P) +#if (MYSQL_VERSION_ID >= 100302 && defined(MRN_MARIADB_P)) || \ + (MYSQL_VERSION_ID >= 80011 && !defined(MRN_MARIADB_P)) # define MRN_KEY_PART_SPEC_FIELD_NAME_USE_CONST_STRING #endif -------------- next part -------------- HTML����������������������������... URL: https://lists.osdn.me/mailman/archives/groonga-mysql-commit/attachments/20180709/b50e6e32/attachment-0001.htm
