From aac391952f579aefcecb8506b4b09c6e2360fa17 Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@fedoraproject.org>
Date: Sat, 11 Jul 2009 03:43:11 +0000
Subject: [PATCH] Update to MySQL 5.1.36

---
 .cvsignore             |  2 +-
 mysql-plugin-bug.patch | 14 +++++++-------
 mysql.spec             |  6 +++++-
 sources                |  2 +-
 4 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 19af1d3..d8f489a 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-mysql-5.1.35.tar.gz
+mysql-5.1.36.tar.gz
diff --git a/mysql-plugin-bug.patch b/mysql-plugin-bug.patch
index c86ff5a..35036eb 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.35.orig/mysql-test/t/disabled.def mysql-5.1.35/mysql-test/t/disabled.def
---- mysql-5.1.35.orig/mysql-test/t/disabled.def	2009-05-14 08:22:26.000000000 -0400
-+++ mysql-5.1.35/mysql-test/t/disabled.def	2009-06-06 18:58:28.000000000 -0400
-@@ -15,3 +15,5 @@
- 
- #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.
+diff -Naur mysql-5.1.36.orig/mysql-test/t/disabled.def mysql-5.1.36/mysql-test/t/disabled.def
+--- mysql-5.1.36.orig/mysql-test/t/disabled.def	2009-06-16 09:43:04.000000000 -0400
++++ mysql-5.1.36/mysql-test/t/disabled.def	2009-07-10 22:00:42.000000000 -0400
+@@ -12,3 +12,5 @@
+ kill                     : Bug#37780 2008-12-03 HHunger need some changes to be robust enough for pushbuild.
+ 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"
+ query_cache_28249        : Bug#43861 2009-03-25 main.query_cache_28249 fails sporadically
 +#
 +plugin_load     : gives wrong answer on PPC64
diff --git a/mysql.spec b/mysql.spec
index fcd5cf8..1b07050 100644
--- a/mysql.spec
+++ b/mysql.spec
@@ -1,5 +1,5 @@
 Name: mysql
-Version: 5.1.35
+Version: 5.1.36
 Release: 1%{?dist}
 Summary: MySQL client programs and shared libraries
 Group: Applications/Databases
@@ -639,6 +639,10 @@ fi
 %{_mandir}/man1/mysql_client_test.1*
 
 %changelog
+* Fri Jul 10 2009 Tom Lane <tgl@redhat.com> 5.1.36-1
+- Update to MySQL 5.1.36, for various fixes described at
+  http://dev.mysql.com/doc/refman/5.1/en/news-5-1-36.html
+
 * Sat Jun  6 2009 Tom Lane <tgl@redhat.com> 5.1.35-1
 - Update to MySQL 5.1.35, for various fixes described at
   http://dev.mysql.com/doc/refman/5.1/en/news-5-1-35.html
diff --git a/sources b/sources
index f21e3f6..6ccf51b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-327bffc7a2a5fd4471fbbaab125275cd  mysql-5.1.35.tar.gz
+18e694c4ecbe851fe8e21e1668116c46  mysql-5.1.36.tar.gz