From af5d0e52a1f64542b9f6ce11626a97ff9d5ae16d Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@fedoraproject.org>
Date: Tue, 7 Apr 2009 23:41:39 +0000
Subject: [PATCH] Update to MySQL 5.1.33

---
 .cvsignore                |  2 +-
 mysql-plugin-bug.patch    | 10 +++++-----
 mysql-setschedparam.patch | 22 ++++++++++++++++++++++
 mysql-stack.patch         |  4 ++++
 mysql.spec                | 13 ++++++++++---
 sources                   |  2 +-
 6 files changed, 43 insertions(+), 10 deletions(-)
 create mode 100644 mysql-setschedparam.patch

diff --git a/.cvsignore b/.cvsignore
index 63a57e7..e982e79 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-mysql-5.1.32.tar.gz
+mysql-5.1.33.tar.gz
diff --git a/mysql-plugin-bug.patch b/mysql-plugin-bug.patch
index 0cb2246..f05ccd1 100644
--- a/mysql-plugin-bug.patch
+++ b/mysql-plugin-bug.patch
@@ -7,12 +7,12 @@ http://bugs.mysql.com/bug.php?id=42144
 For the moment, just disable this test.
 
 
-diff -Naur mysql-5.1.32.orig/mysql-test/t/disabled.def mysql-5.1.32/mysql-test/t/disabled.def
---- mysql-5.1.32.orig/mysql-test/t/disabled.def	2009-02-13 20:34:40.000000000 -0500
-+++ mysql-5.1.32/mysql-test/t/disabled.def	2009-03-04 18:48:34.000000000 -0500
-@@ -12,3 +12,5 @@
+diff -Naur mysql-5.1.33.orig/mysql-test/t/disabled.def mysql-5.1.33/mysql-test/t/disabled.def
+--- mysql-5.1.33.orig/mysql-test/t/disabled.def	2009-03-13 18:39:40.000000000 -0400
++++ mysql-5.1.33/mysql-test/t/disabled.def	2009-04-07 17:20:13.000000000 -0400
+@@ -11,3 +11,5 @@
+ ##############################################################################
  kill                     : Bug#37780 2008-12-03 HHunger need some changes to be robust enough for pushbuild.
- query_cache_28249        : Bug#41098 Query Cache returns wrong result with concurrent insert
  innodb_bug39438          : BUG#42383 2009-01-28 lsoares "This fails in embedded and on windows.  Note that this test is not run on windows and on embedded in PB for main trees currently"
 +#
 +plugin_load     : gives wrong answer on PPC64
diff --git a/mysql-setschedparam.patch b/mysql-setschedparam.patch
new file mode 100644
index 0000000..3b0e518
--- /dev/null
+++ b/mysql-setschedparam.patch
@@ -0,0 +1,22 @@
+mysql tries to use pthread_setschedparam() with policy = SCHED_OTHER,
+which is not standardized and is not presently supported on Red Hat
+platforms; in fact it generates lots of SELinux warnings (bug #477624).
+Easiest fix is to disable the configure test for it.
+
+
+diff -Naur mysql-5.1.33.orig/configure.in mysql-5.1.33/configure.in
+--- mysql-5.1.33.orig/configure.in	2009-03-13 17:48:52.000000000 -0400
++++ mysql-5.1.33/configure.in	2009-04-07 19:27:25.000000000 -0400
+@@ -2046,10 +2046,10 @@
+   localtime_r gethrtime gmtime_r \
+   locking longjmp lrand48 madvise mallinfo memcpy memmove \
+   mkstemp mlockall perror poll pread pthread_attr_create mmap mmap64 getpagesize \
+-  pthread_attr_getstacksize pthread_attr_setprio pthread_attr_setschedparam \
++  pthread_attr_getstacksize pthread_attr_setprio \
+   pthread_attr_setstacksize pthread_condattr_create pthread_getsequence_np \
+   pthread_key_delete pthread_rwlock_rdlock pthread_setprio \
+-  pthread_setprio_np pthread_setschedparam pthread_sigmask readlink \
++  pthread_setprio_np pthread_sigmask readlink \
+   realpath rename rint rwlock_init setupterm \
+   shmget shmat shmdt shmctl sigaction sigemptyset sigaddset \
+   sighold sigset sigthreadmask port_create sleep \
diff --git a/mysql-stack.patch b/mysql-stack.patch
index b93d8db..c4fd437 100644
--- a/mysql-stack.patch
+++ b/mysql-stack.patch
@@ -8,6 +8,10 @@ Note: STACK_MIN_SIZE has to be enough less than DEFAULT_THREAD_STACK / 8
 to provide some headroom, which means that its value can't be raised too much
 further without increasing the latter as well.
 
+As of 5.1.33 the stock value is 16000, which might be enough ... or maybe
+not.  For the moment, we keep this patch around for reference, but it's
+not being applied.
+
 
 diff -Naur mysql-5.1.30.orig/sql/mysql_priv.h mysql-5.1.30/sql/mysql_priv.h
 --- mysql-5.1.30.orig/sql/mysql_priv.h	2008-11-14 11:37:13.000000000 -0500
diff --git a/mysql.spec b/mysql.spec
index 506d35f..8e2b572 100644
--- a/mysql.spec
+++ b/mysql.spec
@@ -1,5 +1,5 @@
 Name: mysql
-Version: 5.1.32
+Version: 5.1.33
 Release: 1%{?dist}
 Summary: MySQL client programs and shared libraries
 Group: Applications/Databases
@@ -25,11 +25,12 @@ Source999: filter-requires-mysql.sh
 
 Patch1: mysql-ssl-multilib.patch
 Patch2: mysql-errno.patch
-Patch3: mysql-stack.patch
+# Patch3: mysql-stack.patch
 Patch4: mysql-testing.patch
 Patch5: mysql-install-test.patch
 Patch6: mysql-stack-guard.patch
 Patch7: mysql-plugin-bug.patch
+Patch8: mysql-setschedparam.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: gperf, perl, readline-devel, openssl-devel
@@ -165,11 +166,12 @@ the MySQL sources.
 
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
+# %patch3 -p1
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
 
 libtoolize --force
 aclocal
@@ -635,6 +637,11 @@ fi
 %{_mandir}/man1/mysql_client_test.1*
 
 %changelog
+* Tue Apr  7 2009 Tom Lane <tgl@redhat.com> 5.1.33-1
+- Update to MySQL 5.1.33.
+- Disable use of pthread_setschedparam; doesn't work the way code expects.
+Related: #477624
+
 * Wed Mar  4 2009 Tom Lane <tgl@redhat.com> 5.1.32-1
 - Update to MySQL 5.1.32.
 
diff --git a/sources b/sources
index 6e17c26..ec8dd62 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f2d14b5e3b9d50b809c9b9985e4513b7  mysql-5.1.32.tar.gz
+9c5711e9bea4514df6f2659f283f0aa0  mysql-5.1.33.tar.gz