Merge ~niedbalski/ubuntu/+source/percona-xtradb-cluster-5.5:fix-ppc64build into ~paelzer/ubuntu/+source/percona-xtradb-cluster-5.5:fix-lp1657256-t

[Jorge Niedbalski]

Fixes FTBFS for PPC64el.

Reference: https://bugs.launchpad.net/ubuntu/+source/percona-xtradb-cluster-5.5/+bug/1002848

PPA For testing: https://launchpad.net/~niedbalski/+archive/ubuntu/fix-1657256-t/

[Christian Ehrhardt  (paelzer)]

No need to make an extra package version of this, but I can fix that up while merging.

Thanks for finding the bug and mapping to it.
I approve the change in general and will test it now.

[Christian Ehrhardt  (paelzer)]

Builds fine now on all arches, thanks.
I'll soon ask (in the bug) for final test from the ppa.

[Christian Ehrhardt  (paelzer)]

Tests complete and working.

review: Approve

diff --git a/debian/changelog b/debian/changelog
index a28f5fa..154edde 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+percona-xtradb-cluster-5.5 (5.5.37-25.10+dfsg-0ubuntu0.14.04.6) trusty; urgency=high
+
+  * d/p/fix_time_collector_lock_type.patch: Changes time_collector_lock
+    to be mutable (LP: #1002848).
+
+ -- Jorge Niedbalski <[e-mail]>  Wed, 25 Oct 2017 11:35:03 -0300
+
 percona-xtradb-cluster-5.5 (5.5.37-25.10+dfsg-0ubuntu0.14.04.5) trusty; urgency=medium
 
   [ Mario Splivalo ]
diff --git a/debian/patches/fix_time_collector_lock_type.patch b/debian/patches/fix_time_collector_lock_type.patch
new file mode 100644
index 0000000..c770eb0
--- /dev/null
+++ b/debian/patches/fix_time_collector_lock_type.patch
@@ -0,0 +1,20 @@
+Description: Changes time_collector_lock to be mutable.
+Fixes (LP: #1002848).
+
+Author: Jorge Niedbalski <[e-mail]>
+Ubuntu-Bug: https://bugs.launchpad.net/percona-server/+bug/1002848
+
+
+diff --git a/sql/query_response_time.cc b/sql/query_response_time.cc
+index c827317..1161d6c 100644
+--- a/sql/query_response_time.cc
++++ b/sql/query_response_time.cc
+@@ -198,7 +198,7 @@ private:
+   /* The lock for atomic operations on m_count and m_total.  Only actually
+   used on architectures that do not have atomic implementation of atomic
+   operations. */
+-  my_atomic_rwlock_t time_collector_lock;
++  mutable my_atomic_rwlock_t time_collector_lock;
+   uint32   m_count[OVERALL_POWER_COUNT + 1];
+   uint64   m_total[OVERALL_POWER_COUNT + 1];
+ };
diff --git a/debian/patches/series b/debian/patches/series
index 288ef29..3ec4790 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@ fix_standalone_tests.patch
 fix_tc_log_initialization_on_ppc64.patch
 fix_duplicate_primary_key.patch
 fix_power8_crash_under_load.patch
+fix_time_collector_lock_type.patch