Navigation Menu

Skip to content

Commit

Permalink
mysql57: support PSI_memory_key for my_strdup()
Browse files Browse the repository at this point in the history
  • Loading branch information
kou committed Mar 17, 2015
1 parent 78c1890 commit 070dac1
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions mrn_table.cpp
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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))
{
Expand Down

0 comments on commit 070dac1

Please sign in to comment.