From 82ab89f3ab0c923e39a8ac071bf1549eb3224c43 Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@fedoraproject.org>
Date: Sat, 16 May 2009 02:38:15 +0000
Subject: [PATCH] Update to MySQL 5.1.34

---
 .cvsignore             |  2 +-
 mysql-plugin-bug.patch | 12 ++++++------
 mysql.init             |  2 +-
 mysql.spec             |  9 +++++++--
 sources                |  2 +-
 5 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index e982e79..e298609 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-mysql-5.1.33.tar.gz
+mysql-5.1.34.tar.gz
diff --git a/mysql-plugin-bug.patch b/mysql-plugin-bug.patch
index f05ccd1..c0a9295 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.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.
+diff -Naur mysql-5.1.34.orig/mysql-test/t/disabled.def mysql-5.1.34/mysql-test/t/disabled.def
+--- mysql-5.1.34.orig/mysql-test/t/disabled.def	2009-03-31 11:26:07.000000000 -0400
++++ mysql-5.1.34/mysql-test/t/disabled.def	2009-05-15 20:02:24.000000000 -0400
+@@ -13,3 +13,5 @@
  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"
+ #concurrent_innodb_safelog: disabled for embedded server due to bug#43733 Select on processlist let the embedded server crash (concurrent_innodb_safelog).
+ #concurrent_innodb_unsafelog: disabled for embedded server due to bug#43733.
 +#
 +plugin_load     : gives wrong answer on PPC64
diff --git a/mysql.init b/mysql.init
index 84422a1..438f868 100644
--- a/mysql.init
+++ b/mysql.init
@@ -66,7 +66,7 @@ start(){
 	# Rather than assuming we know a valid username, accept an "access
 	# denied" response as meaning the server is functioning.
 	if [ $ret -eq 0 ]; then
-	    STARTTIMEOUT=30
+	    STARTTIMEOUT=60
 	    while [ $STARTTIMEOUT -gt 0 ]; do
 		RESPONSE=`/usr/bin/mysqladmin --socket="$socketfile" --user=UNKNOWN_MYSQL_USER ping 2>&1` && break
 		echo "$RESPONSE" | grep -q "Access denied for user" && break
diff --git a/mysql.spec b/mysql.spec
index a9cf83e..c8f73a4 100644
--- a/mysql.spec
+++ b/mysql.spec
@@ -1,6 +1,6 @@
 Name: mysql
-Version: 5.1.33
-Release: 2%{?dist}
+Version: 5.1.34
+Release: 1%{?dist}
 Summary: MySQL client programs and shared libraries
 Group: Applications/Databases
 URL: http://www.mysql.com
@@ -639,6 +639,11 @@ fi
 %{_mandir}/man1/mysql_client_test.1*
 
 %changelog
+* Fri May 15 2009 Tom Lane <tgl@redhat.com> 5.1.34-1
+* Update to MySQL 5.1.34, for various fixes described at
+  http://dev.mysql.com/doc/refman/5.1/en/news-5-1-34.html
+* Increase startup timeout per bug #472222
+
 * Wed Apr 15 2009 Tom Lane <tgl@redhat.com> 5.1.33-2
 - Increase stack size of ndbd threads for safety's sake.
 Related: #494631
diff --git a/sources b/sources
index ec8dd62..d0d6bc2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9c5711e9bea4514df6f2659f283f0aa0  mysql-5.1.33.tar.gz
+42493187729677cf8f77faeeebd5b3c2  mysql-5.1.34.tar.gz