Kouhei Sutou
null+****@clear*****
Sun Dec 24 01:38:25 JST 2017
Kouhei Sutou 2017-12-24 01:38:25 +0900 (Sun, 24 Dec 2017) New Revision: 3462e8d789f5fbc7c693f2249982b6c5f13692c0 https://github.com/mroonga/mroonga/commit/3462e8d789f5fbc7c693f2249982b6c5f13692c0 Message: mariadb10.3: follow constant string change Modified files: mrn_table.cpp Modified: mrn_table.cpp (+9 -2) =================================================================== --- mrn_table.cpp 2017-12-24 01:37:40 +0900 (30c6c147) +++ mrn_table.cpp 2017-12-24 01:38:25 +0900 (ae4c0ead) @@ -36,12 +36,18 @@ #include <mrn_lock.hpp> #ifdef MRN_MARIADB_P +# if MYSQL_VERSION_ID >= 100300 + typedef LEX_CSTRING mrn_resolve_name; +# else + typedef LEX_STRING mrn_resolve_name; +# endif # if MYSQL_VERSION_ID >= 100100 # define MRN_HA_RESOLVE_BY_NAME(name) ha_resolve_by_name(NULL, (name), TRUE) # else # define MRN_HA_RESOLVE_BY_NAME(name) ha_resolve_by_name(NULL, (name)) # endif #else + typedef LEX_STRING mrn_resolve_name; # if MYSQL_VERSION_ID >= 50603 # define MRN_HA_RESOLVE_BY_NAME(name) ha_resolve_by_name(NULL, (name), TRUE) # else @@ -483,7 +489,7 @@ int mrn_parse_table_param(MRN_SHARE *share, TABLE *table) if (share->engine) { - LEX_STRING engine_name; + mrn_resolve_name engine_name; if ( ( share->engine_length == MRN_DEFAULT_LEN && @@ -1096,7 +1102,8 @@ TABLE_SHARE *mrn_create_tmp_table_share(TABLE_LIST *table_list, const char *path void mrn_free_tmp_table_share(TABLE_SHARE *tmp_table_share) { MRN_DBUG_ENTER_FUNCTION(); - char *normalized_path = tmp_table_share->normalized_path.str; + char *normalized_path = + const_cast<char *>(tmp_table_share->normalized_path.str); free_table_share(tmp_table_share); my_free(normalized_path); DBUG_VOID_RETURN; -------------- next part -------------- HTML����������������������������... URL: https://lists.osdn.me/mailman/archives/groonga-mysql-commit/attachments/20171224/113325b3/attachment.htm
