Kouhei Sutou
null+****@clear*****
Tue Mar 17 21:57:36 JST 2015
Kouhei Sutou 2015-03-17 21:57:36 +0900 (Tue, 17 Mar 2015) New Revision: 070dac13aaf62ba1f432a6b53f244ecd3ac3764b https://github.com/mroonga/mroonga/commit/070dac13aaf62ba1f432a6b53f244ecd3ac3764b Message: mysql57: support PSI_memory_key for my_strdup() Modified files: mrn_table.cpp Modified: mrn_table.cpp (+3 -3) =================================================================== --- mrn_table.cpp 2015-03-17 21:56:27 +0900 (d74bc07) +++ mrn_table.cpp 2015-03-17 21:57:36 +0900 (824ff5b) @@ -516,7 +516,7 @@ int mrn_add_index_param(MRN_SHARE *share, KEY *key_info, int i) my_free(share->key_parser[i]); } if ( - !(share->key_parser[i] = my_strdup(mrn_default_parser, MYF(MY_WME))) + !(share->key_parser[i] = mrn_my_strdup(mrn_default_parser, MYF(MY_WME))) ) { error = HA_ERR_OUT_OF_MEM; goto error; @@ -578,7 +578,7 @@ int mrn_add_index_param(MRN_SHARE *share, KEY *key_info, int i) #endif if (!share->key_parser[i]) { if ( - !(share->key_parser[i] = my_strdup(mrn_default_parser, MYF(MY_WME))) + !(share->key_parser[i] = mrn_my_strdup(mrn_default_parser, MYF(MY_WME))) ) { error = HA_ERR_OUT_OF_MEM; goto error; @@ -1042,7 +1042,7 @@ TABLE_SHARE *mrn_create_tmp_table_share(TABLE_LIST *table_list, const char *path share->tmp_table = INTERNAL_TMP_TABLE; // TODO: is this right? share->path.str = (char *) path; share->path.length = strlen(share->path.str); - share->normalized_path.str = my_strdup(path, MYF(MY_WME)); + share->normalized_path.str = mrn_my_strdup(path, MYF(MY_WME)); share->normalized_path.length = strlen(share->normalized_path.str); if (open_table_def(thd, share, GTS_TABLE)) { -------------- next part -------------- HTML����������������������������...Download