From 5845b83d18fe0e6e2e16a3073960396a72a97ef1 Mon Sep 17 00:00:00 2001 From: Sergey Vojtovich Date: Fri, 26 Jul 2013 13:04:59 +0400 Subject: [PATCH] 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. --- plugin/query_response_time/query_response_time.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugin/query_response_time/query_response_time.cc b/plugin/query_response_time/query_response_time.cc index c8273172205..b28962a5db4 100644 --- a/plugin/query_response_time/query_response_time.cc +++ b/plugin/query_response_time/query_response_time.cc @@ -156,14 +156,14 @@ public: { my_atomic_rwlock_destroy(&time_collector_lock); } - uint32 count(uint index) const + uint32 count(uint index) { my_atomic_rwlock_rdlock(&time_collector_lock); uint32 result= my_atomic_load32((int32*)&m_count[index]); my_atomic_rwlock_rdunlock(&time_collector_lock); return result; } - uint64 total(uint index) const + uint64 total(uint index) { my_atomic_rwlock_rdlock(&time_collector_lock); uint64 result= my_atomic_load64((int64*)&m_total[index]);