diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-08-31 09:22:21 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-08-31 09:22:21 +0300 |
commit | 04647611260a77041186ace12f96b05d50bed4da (patch) | |
tree | 3f8efa00ae2fa2bc6be5165658c34c79c9437a3f /storage/perfschema | |
parent | dc6bc85cd29586631d927036451d955c7013206c (diff) | |
parent | e835cc851e389770219a33037af65db8887cc9a8 (diff) | |
download | mariadb-git-04647611260a77041186ace12f96b05d50bed4da.tar.gz |
Merge 10.3 into 10.4
Diffstat (limited to 'storage/perfschema')
-rw-r--r-- | storage/perfschema/pfs.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/storage/perfschema/pfs.cc b/storage/perfschema/pfs.cc index 2f1081b3836..44bcbad87d7 100644 --- a/storage/perfschema/pfs.cc +++ b/storage/perfschema/pfs.cc @@ -1496,7 +1496,7 @@ static void register_socket_v1(const char *category, @sa PSI_v1::init_mutex. */ static PSI_mutex* -init_mutex_v1(PSI_mutex_key key, const void *identity) +init_mutex_v1(PSI_mutex_key key, void *identity) { INIT_BODY_V1(mutex, key, identity); } @@ -1519,7 +1519,7 @@ static void destroy_mutex_v1(PSI_mutex* mutex) @sa PSI_v1::init_rwlock. */ static PSI_rwlock* -init_rwlock_v1(PSI_rwlock_key key, const void *identity) +init_rwlock_v1(PSI_rwlock_key key, void *identity) { INIT_BODY_V1(rwlock, key, identity); } @@ -1542,7 +1542,7 @@ static void destroy_rwlock_v1(PSI_rwlock* rwlock) @sa PSI_v1::init_cond. */ static PSI_cond* -init_cond_v1(PSI_cond_key key, const void *identity) +init_cond_v1(PSI_cond_key key, void *identity) { INIT_BODY_V1(cond, key, identity); } |