[packages/percona-server/v5.0.x: 139/202] - updated percona patches to 5.0.87-b20

glen glen at pld-linux.org
Wed Oct 21 16:20:43 CEST 2015


commit 1e93024413f7315f9989dc2ab3eebf7523188679
Author: Elan Ruusamäe <glen at pld-linux.org>
Date:   Tue Dec 22 08:10:31 2009 +0000

    - updated percona patches to 5.0.87-b20
    
    Changed files:
        mysql-gcc3.patch -> 1.1.2.3
        mysql.spec -> 1.353.2.87

 mysql-gcc3.patch | 38 --------------------------------------
 mysql.spec       |  4 ----
 2 files changed, 42 deletions(-)
---
diff --git a/mysql.spec b/mysql.spec
index 0fa2584..e957389 100644
--- a/mysql.spec
+++ b/mysql.spec
@@ -68,7 +68,6 @@ Patch16:	%{name}-errorlog-no-rename.patch
 Patch17:	%{name}-alpha-stack.patch
 Patch18:	%{name}-xtrabackup.patch
 Patch19:	%{name}-fixes.patch
-Patch20:	%{name}-gcc3.patch
 Patch21:	%{name}-atomic.patch
 Patch22:	%{name}-fix-dummy-thread-race-condition.patch
 # <percona patches, http://www.percona.com/percona-lab.html>
@@ -564,9 +563,6 @@ mv sphinx-*/mysqlse sql/sphinx
 # </percona>
 
 %patch19 -p1
-%if "%{cxx_version}" < "4.1"
-%patch20 -p1
-%endif
 %patch21 -p0
 %patch22 -p1
 
diff --git a/mysql-gcc3.patch b/mysql-gcc3.patch
deleted file mode 100644
index b49bd0c..0000000
--- a/mysql-gcc3.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- mysql-5.0.81/innobase/include/sync0rw.h~	2009-05-26 00:35:13.000000000 +0300
-+++ mysql-5.0.81/innobase/include/sync0rw.h	2009-06-16 19:09:27.587270045 +0300
-@@ -421,12 +421,6 @@
- #ifdef HAVE_ATOMIC_BUILTINS
- /* This value means NOT_LOCKED */
- #define RW_LOCK_BIAS		0x00100000
--#else
--#error HAVE_ATOMIC_BUILTINS is not defined. Do you use enough new GCC or compatibles?
--#error Or do you use exact options for CFLAGS?
--#error e.g. (for x86_32): "-m32 -march=i586 -mtune=i686"
--#error e.g. (for Sparc_64): "-m64 -mcpu=v9"
--#error Otherwise, this build may be slower than normal version.
- #endif
- 
- /* NOTE! The structure appears here only for the compiler to know its size.
-
-
-
-NOTE: this chunk is to fix buggy percona patch:
---- mysql-5.0.83/innobase/sync/sync0rw.c~	2009-07-16 12:43:34.863559101 +0300
-+++ mysql-5.0.83/innobase/sync/sync0rw.c	2009-07-16 13:01:55.553904932 +0300
-@@ -626,10 +626,14 @@
- 	} else if (state == RW_LOCK_NOT_LOCKED) {
- 
-  		/* Spin waiting for the writer field to become free */
--
-+#ifdef  HAVE_ATOMIC_BUILTINS
-         	while (i < SYNC_SPIN_ROUNDS
- 			&& lock->lock_word != RW_LOCK_BIAS) {
--        		if (srv_spin_wait_delay) {
-+#else
-+				while (rw_lock_get_writer(lock) != RW_LOCK_NOT_LOCKED
-+						&& i < SYNC_SPIN_ROUNDS) {
-+#endif
-+				if (srv_spin_wait_delay) {
- 				ut_delay(ut_rnd_interval(0,
- 							srv_spin_wait_delay));
-         		}
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/percona-server.git/commitdiff/431f68fe79a66d5dfdd53f2655709e6c925fbc22



More information about the pld-cvs-commit mailing list