Merge pull request MariaDB#39 from cvicentiu/master

Update patch that reverts changes from 10.0.26 that caused regression on PowerPC

Author: ottok

debian/changelog

@@ -48,6 +48,9 @@ mariadb-10.0 (10.0.26-1) unstable; urgency=low
   * New upstream release 10.0.26
   * Refresh patches after 10.0.26 import
 
+  [ Vicențiu Ciorbaru ]
+  * Revert innodb and xtradb PowerPC synchronization fix from upstream 10.0.26
+
  -- Otto Kekäläinen <[email protected]>  Fri, 24 Jun 2016 17:05:44 +0300
 
 mariadb-10.0 (10.0.25-1) unstable; urgency=low

debian/patches/fix-ppc64el-build-regression.patch

@@ -0,0 +1,80 @@
+Description: Revert innodb and xtradb PowerPC synchronization from 10.0.26
+  On PowerPC 64 Little Endian we have synchronization problems that causes
+  warnings in test cases. The patch reverts these changes from 10.0.26 that
+  caused this regression.
+
+  The patch was initially proposed by Sergey Vojtovich, altered slightly to
+  have it compile.
+  .
+  This patch should be removed when upstream provides an adequate fix.
+Author: Vicențiu Ciorbaru <[email protected]>
+diff --git a/storage/innobase/include/os0sync.h b/storage/innobase/include/os0sync.h
+index 1cf4e9c..1abb774 100644
+--- a/storage/innobase/include/os0sync.h
++++ b/storage/innobase/include/os0sync.h
+@@ -492,7 +492,8 @@ inline
+ lock_word_t
+ os_atomic_clear(volatile lock_word_t* ptr)
+ {
+-	return(__sync_lock_test_and_set(ptr, 0));
++		__sync_lock_release(ptr);
++	return *ptr;
+ }
+ 
+ # elif defined(HAVE_IB_GCC_ATOMIC_TEST_AND_SET)
+@@ -861,6 +862,7 @@ for synchronization */
+ architecture. Disable memory barrier for Intel architecture for now. */
+ # define os_rmb do { } while(0)
+ # define os_wmb do { } while(0)
++# define os_mb  do { } while(0)
+ # define os_isync do { } while(0)
+ # define IB_MEMORY_BARRIER_STARTUP_MSG \
+ 	"Memory barrier is not used"
+diff --git a/storage/innobase/include/sync0sync.ic b/storage/innobase/include/sync0sync.ic
+index 55f728f..0b6858a 100644
+--- a/storage/innobase/include/sync0sync.ic
++++ b/storage/innobase/include/sync0sync.ic
+@@ -178,6 +178,8 @@ mutex_exit_func(
+ 	to wake up possible hanging threads if
+ 	they are missed in mutex_signal_object. */
+ 
++	os_mb;
++
+ 	if (mutex_get_waiters(mutex) != 0) {
+ 
+ 		mutex_signal_object(mutex);
+diff --git a/storage/xtradb/include/os0sync.h b/storage/xtradb/include/os0sync.h
+index 0f93f3f..2aa9478 100644
+--- a/storage/xtradb/include/os0sync.h
++++ b/storage/xtradb/include/os0sync.h
+@@ -543,7 +543,8 @@ inline
+ lock_word_t
+ os_atomic_clear(volatile lock_word_t* ptr)
+ {
+-	return(__sync_lock_test_and_set(ptr, 0));
++		__sync_lock_release(ptr);
++	return *ptr;
+ }
+ 
+ # elif defined(HAVE_IB_GCC_ATOMIC_TEST_AND_SET)
+@@ -912,6 +913,7 @@ for synchronization */
+ architecture. Disable memory barrier for Intel architecture for now. */
+ # define os_rmb do { } while(0)
+ # define os_wmb do { } while(0)
++# define os_mb  do { } while(0)
+ # define os_isync do { } while(0)
+ # define IB_MEMORY_BARRIER_STARTUP_MSG \
+ 	"Memory barrier is not used"
+diff --git a/storage/xtradb/include/sync0sync.ic b/storage/xtradb/include/sync0sync.ic
+index 00db854..fac83a4 100644
+--- a/storage/xtradb/include/sync0sync.ic
++++ b/storage/xtradb/include/sync0sync.ic
+@@ -181,6 +181,8 @@ mutex_exit_func(
+ 	to wake up possible hanging threads if
+ 	they are missed in mutex_signal_object. */
+ 
++	os_mb;
++
+ 	if (mutex_get_waiters(mutex) != 0) {
+ 
+ 		mutex_signal_object(mutex);

debian/patches/innodb_xtradb_10.0.26_regression.patch

@@ -16,4 +16,4 @@ mdev-8375-built-in-auth-socket.patch
 mdev-8375-passwordless-accounts-for-testsuite.patch
 mdev-9528-mysql_embedded.patch
 man_page_tokuftdump.patch
-fix-ppc64el-build-regression.patch
+innodb_xtradb_10.0.26_regression.patch