diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2020-01-29 13:50:26 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2020-03-10 19:24:22 +0100 |
| commit | 7c58e97bf6f80a251046c5b3e7bce826fe058bd6 (patch) | |
| tree | 7d32d26b320cf83296ee0ede2ea164ad116c4de8 /sql/rpl_mi.cc | |
| parent | 2ac3121af2767186c489054db5d4871d04b8eef4 (diff) | |
| download | mariadb-git-7c58e97bf6f80a251046c5b3e7bce826fe058bd6.tar.gz | |
perfschema memory related instrumentation changes
Diffstat (limited to 'sql/rpl_mi.cc')
| -rw-r--r-- | sql/rpl_mi.cc | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/sql/rpl_mi.cc b/sql/rpl_mi.cc index f3c87517f21..fcbd988509d 100644 --- a/sql/rpl_mi.cc +++ b/sql/rpl_mi.cc @@ -58,7 +58,7 @@ Master_info::Master_info(LEX_CSTRING *connection_name_arg, connection_name.length= cmp_connection_name.length= connection_name_arg->length; if ((connection_name.str= tmp= (char*) - my_malloc(connection_name_arg->length*2+2, MYF(MY_WME)))) + my_malloc(PSI_INSTRUMENT_ME, connection_name_arg->length*2+2, MYF(MY_WME)))) { strmake(tmp, connection_name_arg->str, connection_name.length); tmp+= connection_name_arg->length+1; @@ -77,7 +77,7 @@ Master_info::Master_info(LEX_CSTRING *connection_name_arg, parallel_mode= rpl_filter->get_parallel_mode(); - my_init_dynamic_array(&ignore_server_ids, + my_init_dynamic_array(&ignore_server_ids, PSI_INSTRUMENT_ME, sizeof(global_system_variables.server_id), 16, 16, MYF(0)); bzero((char*) &file, sizeof(file)); @@ -742,7 +742,8 @@ int flush_master_info(Master_info* mi, char* ignore_server_ids_buf; { ignore_server_ids_buf= - (char *) my_malloc((sizeof(global_system_variables.server_id) * 3 + 1) * + (char *) my_malloc(PSI_INSTRUMENT_ME, + (sizeof(global_system_variables.server_id) * 3 + 1) * (1 + mi->ignore_server_ids.elements), MYF(MY_WME)); if (!ignore_server_ids_buf) DBUG_RETURN(1); /* error */ @@ -1101,7 +1102,8 @@ bool Master_info_index::init_all_master_info() if (my_hash_init(&master_info_hash, system_charset_info, MAX_REPLICATION_THREAD, 0, 0, (my_hash_get_key) get_key_master_info, - (my_hash_free_key)free_key_master_info, HASH_UNIQUE)) + (my_hash_free_key)free_key_master_info, HASH_UNIQUE, + PSI_INSTRUMENT_ME)) { sql_print_error("Initializing Master_info hash table failed"); DBUG_RETURN(1); @@ -1741,7 +1743,8 @@ Domain_id_filter::Domain_id_filter() : m_filter(false) { for (int i= DO_DOMAIN_IDS; i <= IGNORE_DOMAIN_IDS; i ++) { - my_init_dynamic_array(&m_domain_ids[i], sizeof(ulong), 16, 16, MYF(0)); + my_init_dynamic_array(&m_domain_ids[i], PSI_INSTRUMENT_ME, + sizeof(ulong), 16, 16, MYF(0)); } } @@ -1904,7 +1907,7 @@ char *Domain_id_filter::as_string(enum_list_type type) sz= (sizeof(ulong) * 3 + 1) * (1 + ids->elements); - if (!(buf= (char *) my_malloc(sz, MYF(MY_WME)))) + if (!(buf= (char *) my_malloc(PSI_INSTRUMENT_ME, sz, MYF(MY_WME)))) return NULL; // Store the total number of elements followed by the individual elements. |