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 /storage/blackhole | |
| parent | 2ac3121af2767186c489054db5d4871d04b8eef4 (diff) | |
| download | mariadb-git-7c58e97bf6f80a251046c5b3e7bce826fe058bd6.tar.gz | |
perfschema memory related instrumentation changes
Diffstat (limited to 'storage/blackhole')
| -rw-r--r-- | storage/blackhole/ha_blackhole.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/storage/blackhole/ha_blackhole.cc b/storage/blackhole/ha_blackhole.cc index c7803003398..700277f929e 100644 --- a/storage/blackhole/ha_blackhole.cc +++ b/storage/blackhole/ha_blackhole.cc @@ -323,9 +323,8 @@ static st_blackhole_share *get_share(const char *table_name) my_hash_search(&blackhole_open_tables, (uchar*) table_name, length))) { - if (!(share= (st_blackhole_share*) my_malloc(sizeof(st_blackhole_share) + - length, - MYF(MY_WME | MY_ZEROFILL)))) + if (!(share= (st_blackhole_share*) my_malloc(PSI_INSTRUMENT_ME, + sizeof(st_blackhole_share) + length, MYF(MY_WME | MY_ZEROFILL)))) goto error; share->table_name_length= length; @@ -406,7 +405,8 @@ static int blackhole_init(void *p) &blackhole_mutex, MY_MUTEX_INIT_FAST); (void) my_hash_init(&blackhole_open_tables, system_charset_info,32,0,0, (my_hash_get_key) blackhole_get_key, - (my_hash_free_key) blackhole_free_key, 0); + (my_hash_free_key) blackhole_free_key, 0, + PSI_INSTRUMENT_ME); return 0; } |