packages: mysql/mysql-fix-dummy-thread-race-condition.patch, mysql/mysql.sp...

[glen]

Author: glen                         Date: Tue Oct 27 14:33:21 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fixing php-cli with php-mysql ext segfault:
   https://bugs.launchpad.net/mysql-server/+bug/343870
- rel 2

---- Files affected:
packages/mysql:
   mysql-fix-dummy-thread-race-condition.patch (1.1 -> 1.2) , mysql.spec (1.463 -> 1.464) 

---- Diffs:

================================================================
Index: packages/mysql/mysql-fix-dummy-thread-race-condition.patch
diff -u packages/mysql/mysql-fix-dummy-thread-race-condition.patch:1.1 packages/mysql/mysql-fix-dummy-thread-race-condition.patch:1.2
--- packages/mysql/mysql-fix-dummy-thread-race-condition.patch:1.1	Tue Oct 27 13:34:13 2009
+++ packages/mysql/mysql-fix-dummy-thread-race-condition.patch	Tue Oct 27 15:33:15 2009
@@ -2,21 +2,21 @@
 ##
 ## Avoid dummy thread for pthread_exit workaround
 
---- mysql-5.0.87/mysys/my_thr_init.c~	2009-10-27 13:28:45.000000000 +0200
-+++ mysql-5.0.87/mysys/my_thr_init.c	2009-10-27 13:29:49.502552171 +0200
-@@ -47,23 +47,6 @@
+--- mysql-5.1.40/mysys/my_thr_init.c~	2009-10-06 20:49:02.000000000 +0300
++++ mysql-5.1.40/mysys/my_thr_init.c	2009-10-27 15:01:59.807275693 +0200
+@@ -47,24 +47,6 @@
  pthread_mutexattr_t my_errorcheck_mutexattr;
  #endif
  
 -#ifdef TARGET_OS_LINUX
 -
 -/*
-- Dummy thread spawned in my_thread_global_init() below to avoid
-- race conditions in NPTL pthread_exit code.
+-  Dummy thread spawned in my_thread_global_init() below to avoid
+-  race conditions in NPTL pthread_exit code.
 -*/
 -
 -static pthread_handler_t
--nptl_pthread_exit_hack_handler(void *arg __attribute__((unused)))
+-nptl_pthread_exit_hack_handler(void *arg __attribute((unused)))
 -{
 -  /* Do nothing! */
 -  pthread_exit(0);
@@ -25,10 +25,11 @@
 -
 -#endif /* TARGET_OS_LINUX */
 -
+-
  static uint get_thread_lib(void);
  
  /*
-@@ -71,33 +71,6 @@
+@@ -89,33 +71,6 @@
      return 1;
    }
  

================================================================
Index: packages/mysql/mysql.spec
diff -u packages/mysql/mysql.spec:1.463 packages/mysql/mysql.spec:1.464
--- packages/mysql/mysql.spec:1.463	Thu Oct 22 21:08:15 2009
+++ packages/mysql/mysql.spec	Tue Oct 27 15:33:15 2009
@@ -34,7 +34,7 @@
 Summary(zh_CN.UTF-8):	MySQL数据库服务器
 Name:		mysql
 Version:	5.1.40
-Release:	1
+Release:	2
 License:	GPL + MySQL FLOSS Exception
 Group:		Applications/Databases
 #Source0Download: http://dev.mysql.com/downloads/mysql/5.1.html#source
@@ -70,6 +70,7 @@
 Patch13:	%{name}-errorlog-no-rename.patch
 Patch14:	%{name}-bug-43594.patch
 Patch15:	plugin-avoid-version.patch
+Patch16:	%{name}-fix-dummy-thread-race-condition.patch
 # <percona patches, http://www.percona.com/percona-lab.html>
 Patch100:	%{name}-userstats.patch
 Patch101:	%{name}-microslow.patch
@@ -502,6 +503,7 @@
 %patch13 -p1
 %patch14 -p0
 %patch15 -p1
+%patch16 -p1
 # <percona %patches>
 %patch100 -p1
 %patch101 -p1
@@ -1103,6 +1105,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.464  2009/10/27 14:33:15  glen
+- fixing php-cli with php-mysql ext segfault:
+   https://bugs.launchpad.net/mysql-server/+bug/343870
+- rel 2
+
 Revision 1.463  2009/10/22 19:08:15  arekm
 - up to 5.1.40
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-fix-dummy-thread-race-condition.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql.spec?r1=1.463&r2=1.464&f=u