diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-08-31 10:04:56 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-08-31 10:04:56 +0300 |
commit | e62120cec7aa21b9cf77773ecb0935b4b48ed26c (patch) | |
tree | 38d057014f832f6ba55be1e720c0437f83e4a7e4 /mysys | |
parent | 1a69e1588b47403972a2475216e34dc3ff554eec (diff) | |
parent | 04647611260a77041186ace12f96b05d50bed4da (diff) | |
download | mariadb-git-e62120cec7aa21b9cf77773ecb0935b4b48ed26c.tar.gz |
Merge 10.4 into 10.5
Diffstat (limited to 'mysys')
-rw-r--r-- | mysys/psi_noop.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mysys/psi_noop.c b/mysys/psi_noop.c index 09b839468ac..e81ad4893b7 100644 --- a/mysys/psi_noop.c +++ b/mysys/psi_noop.c @@ -86,7 +86,7 @@ static void register_socket_noop(const char *category NNN, } static PSI_mutex* -init_mutex_noop(PSI_mutex_key key NNN, const void *identity NNN) +init_mutex_noop(PSI_mutex_key key NNN, void *identity NNN) { return NULL; } @@ -97,7 +97,7 @@ static void destroy_mutex_noop(PSI_mutex* mutex NNN) } static PSI_rwlock* -init_rwlock_noop(PSI_rwlock_key key NNN, const void *identity NNN) +init_rwlock_noop(PSI_rwlock_key key NNN, void *identity NNN) { return NULL; } @@ -108,7 +108,7 @@ static void destroy_rwlock_noop(PSI_rwlock* rwlock NNN) } static PSI_cond* -init_cond_noop(PSI_cond_key key NNN, const void *identity NNN) +init_cond_noop(PSI_cond_key key NNN, void *identity NNN) { return NULL; } |