Kouhei Sutou
null+****@clear*****
Fri Apr 27 17:20:37 JST 2018
Kouhei Sutou 2018-04-27 17:20:37 +0900 (Fri, 27 Apr 2018) New Revision: ebc368c46e27360f25eae5b10618925ca3805dd7 https://github.com/mroonga/mroonga/commit/ebc368c46e27360f25eae5b10618925ca3805dd7 Message: mariadb10.3: follow init_alloc_root() API change Modified files: ha_mroonga.cpp mrn_mysql_compat.h Modified: ha_mroonga.cpp (+2 -2) =================================================================== --- ha_mroonga.cpp 2018-04-27 17:15:43 +0900 (36569ed0) +++ ha_mroonga.cpp 2018-04-27 17:20:37 +0900 (a304a4f3) @@ -3280,7 +3280,7 @@ int ha_mroonga::create_share_for_create() const } } } - mrn_init_alloc_root(&mem_root_for_create, 1024, 0, MYF(0)); + mrn_init_alloc_root(&mem_root_for_create, "mroonga::create", 1024, 0, MYF(0)); analyzed_for_create = true; if (table_list) { share_for_create.table_name = mrn_my_strndup(table_list->table_name, @@ -4558,7 +4558,7 @@ int ha_mroonga::wrapper_open(const char *name, int mode, uint open_options) } } - mrn_init_alloc_root(&mem_root, 1024, 0, MYF(0)); + mrn_init_alloc_root(&mem_root, "mroonga::wrapper", 1024, 0, MYF(0)); wrap_key_info = mrn_create_key_info_for_table(share, table, &error); if (error) DBUG_RETURN(error); Modified: mrn_mysql_compat.h (+7 -4) =================================================================== --- mrn_mysql_compat.h 2018-04-27 17:15:43 +0900 (d5a8284e) +++ mrn_mysql_compat.h 2018-04-27 17:20:37 +0900 (a9e7c014) @@ -164,14 +164,17 @@ typedef MYSQL_LEX_STRING mrn_thd_lex_string; #endif -#if defined(MRN_MARIADB_P) && MYSQL_VERSION_ID >= 100000 -# define mrn_init_alloc_root(PTR, SZ1, SZ2, FLAG) \ +#if defined(MRN_MARIADB_P) && MYSQL_VERSION_ID >= 100306 +# define mrn_init_alloc_root(PTR, NAME, SZ1, SZ2, FLAG) \ + init_alloc_root(PTR, NAME, SZ1, SZ2, FLAG) +#elif defined(MRN_MARIADB_P) && MYSQL_VERSION_ID >= 100000 +# define mrn_init_alloc_root(PTR, NAME, SZ1, SZ2, FLAG) \ init_alloc_root(PTR, SZ1, SZ2, FLAG) #elif MYSQL_VERSION_ID >= 50706 -# define mrn_init_alloc_root(PTR, SZ1, SZ2, FLAG) \ +# define mrn_init_alloc_root(PTR, NAME, SZ1, SZ2, FLAG) \ init_alloc_root(mrn_memory_key, PTR, SZ1, SZ2) #else -# define mrn_init_alloc_root(PTR, SZ1, SZ2, FLAG) \ +# define mrn_init_alloc_root(PTR, NAME, SZ1, SZ2, FLAG) \ init_alloc_root(PTR, SZ1, SZ2) #endif -------------- next part -------------- HTML����������������������������... URL: https://lists.osdn.me/mailman/archives/groonga-mysql-commit/attachments/20180427/40034c60/attachment-0001.htm
