Commit 5845b83d authored by Sergey Vojtovich's avatar Sergey Vojtovich

MDEV-4786 - merge 10.0-monty - 10.0

Fixed query_response_time build failure.

plugin/query_response_time/query_response_time.cc:
  my_atomic_rwlock_rdlock() may update time_collector_lock structure.
  Remove const modifier from relevant methods.
parent e084a2b0
...@@ -156,14 +156,14 @@ public: ...@@ -156,14 +156,14 @@ public:
{ {
my_atomic_rwlock_destroy(&time_collector_lock); my_atomic_rwlock_destroy(&time_collector_lock);
} }
uint32 count(uint index) const uint32 count(uint index)
{ {
my_atomic_rwlock_rdlock(&time_collector_lock); my_atomic_rwlock_rdlock(&time_collector_lock);
uint32 result= my_atomic_load32((int32*)&m_count[index]); uint32 result= my_atomic_load32((int32*)&m_count[index]);
my_atomic_rwlock_rdunlock(&time_collector_lock); my_atomic_rwlock_rdunlock(&time_collector_lock);
return result; return result;
} }
uint64 total(uint index) const uint64 total(uint index)
{ {
my_atomic_rwlock_rdlock(&time_collector_lock); my_atomic_rwlock_rdlock(&time_collector_lock);
uint64 result= my_atomic_load64((int64*)&m_total[index]); uint64 result= my_atomic_load64((int64*)&m_total[index]);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment