From fbfeb21c646c2da5a39818fd752387b56c2c3c51 Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@fedoraproject.org>
Date: Tue, 22 Sep 2009 04:29:57 +0000
Subject: [PATCH] Update to MySQL 5.1.39

---
 .cvsignore                |  2 +-
 mysql-ndb-stacksize.patch | 18 +++++++++++-------
 mysql.spec                |  8 ++++++--
 sources                   |  2 +-
 4 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 335cd2f..a37cd26 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-mysql-5.1.37.tar.gz
+mysql-5.1.39.tar.gz
diff --git a/mysql-ndb-stacksize.patch b/mysql-ndb-stacksize.patch
index aaf246d..da4039d 100644
--- a/mysql-ndb-stacksize.patch
+++ b/mysql-ndb-stacksize.patch
@@ -11,17 +11,21 @@ elsewhere.  At some point we might want to use our my_setstacksize()
 hack in NdbThread_Create().
 
 
-diff -Naur mysql-5.1.33.orig/storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp mysql-5.1.33/storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp
---- mysql-5.1.33.orig/storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp	2009-03-13 17:54:07.000000000 -0400
-+++ mysql-5.1.33/storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp	2009-04-15 14:00:04.000000000 -0400
-@@ -106,8 +106,8 @@
+diff -Naur mysql-5.1.39.orig/storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp mysql-5.1.39/storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp
+--- mysql-5.1.39.orig/storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp	2009-09-04 12:21:19.000000000 -0400
++++ mysql-5.1.39/storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp	2009-09-21 22:33:08.000000000 -0400
+@@ -106,13 +106,8 @@
  AsyncFile::doStart() 
  {
    // Stacksize for filesystem threads
--  // An 8k stack should be enough
--  const NDB_THREAD_STACKSIZE stackSize = 8192;
+-#if !defined(DBUG_OFF) && defined (__hpux)
+-  // Empirical evidence indicates at least 32k
 +  // don't make this too small
-+  const NDB_THREAD_STACKSIZE stackSize = 32768;
+   const NDB_THREAD_STACKSIZE stackSize = 32768;
+-#else
+-  // Otherwise an 8k stack should be enough
+-  const NDB_THREAD_STACKSIZE stackSize = 8192;
+-#endif
  
    char buf[16];
    numAsyncFiles++;
diff --git a/mysql.spec b/mysql.spec
index 8f0b1f4..77e9872 100644
--- a/mysql.spec
+++ b/mysql.spec
@@ -1,6 +1,6 @@
 Name: mysql
-Version: 5.1.37
-Release: 5%{?dist}
+Version: 5.1.39
+Release: 1%{?dist}
 Summary: MySQL client programs and shared libraries
 Group: Applications/Databases
 URL: http://www.mysql.com
@@ -642,6 +642,10 @@ fi
 %{_mandir}/man1/mysql_client_test.1*
 
 %changelog
+* Tue Sep 22 2009 Tom Lane <tgl@redhat.com> 5.1.39-1
+- Update to MySQL 5.1.39, for various fixes described at
+  http://dev.mysql.com/doc/refman/5.1/en/news-5-1-39.html
+
 * Mon Aug 31 2009 Tom Lane <tgl@redhat.com> 5.1.37-5
 - Work around unportable assumptions about stpcpy(); re-enable main.mysql test
 - Clean up some obsolete parameters to the configure script
diff --git a/sources b/sources
index 39a7477..ee00ff8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cbdb8783b053019755ee9196f67ea04c  mysql-5.1.37.tar.gz
+55a398daeb69a778fc46573623143268  mysql-5.1.39.tar.gz