From 51519c66b446ad6ac471faf4579db630851855f9 Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@fedoraproject.org>
Date: Tue, 24 Nov 2009 05:04:04 +0000
Subject: [PATCH] Update to MySQL 5.1.41, also remove old_passwords=1

---
 .cvsignore             |  2 +-
 my.cnf                 |  3 ---
 mysql-plugin-bug.patch | 12 ++++++------
 mysql.spec             |  8 +++++++-
 sources                |  2 +-
 5 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index b89c219..685b897 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-mysql-5.1.40.tar.gz
+mysql-5.1.41.tar.gz
diff --git a/my.cnf b/my.cnf
index a76b9c6..fa8e124 100644
--- a/my.cnf
+++ b/my.cnf
@@ -2,9 +2,6 @@
 datadir=/var/lib/mysql
 socket=/var/lib/mysql/mysql.sock
 user=mysql
-# Default to using old password format for compatibility with mysql 3.x
-# clients (those using the mysqlclient10 compatibility package).
-old_passwords=1
 
 # To allow mysqld to connect to a MySQL Cluster management daemon, uncomment
 # these lines and adjust the connectstring as needed.
diff --git a/mysql-plugin-bug.patch b/mysql-plugin-bug.patch
index a1b909a..865acf5 100644
--- a/mysql-plugin-bug.patch
+++ b/mysql-plugin-bug.patch
@@ -11,13 +11,13 @@ platform-dependent results, with the "expected" results being arguably the
 wrong ones.  This is upstream at http://bugs.mysql.com/bug.php?id=46895
 
 
-diff -Naur mysql-5.1.40.orig/mysql-test/t/disabled.def mysql-5.1.40/mysql-test/t/disabled.def
---- mysql-5.1.40.orig/mysql-test/t/disabled.def	2009-10-06 14:21:05.000000000 -0400
-+++ mysql-5.1.40/mysql-test/t/disabled.def	2009-11-10 13:01:50.000000000 -0500
-@@ -14,3 +14,6 @@
- query_cache_28249        : Bug#43861 2009-03-25 main.query_cache_28249 fails sporadically
- partition_innodb_builtin : Bug#32430 2009-09-25 mattiasj Waiting for push of Innodb changes
+diff -Naur mysql-5.1.41.orig/mysql-test/t/disabled.def mysql-5.1.41/mysql-test/t/disabled.def
+--- mysql-5.1.41.orig/mysql-test/t/disabled.def	2009-11-04 14:00:39.000000000 -0500
++++ mysql-5.1.41/mysql-test/t/disabled.def	2009-11-23 22:04:14.000000000 -0500
+@@ -15,3 +15,6 @@
  partition_innodb_plugin  : Bug#32430 2009-09-25 mattiasj Waiting for push of Innodb changes
+ innodb-autoinc           : Bug#48482 2009-11-02 svoj innodb-autoinc.test fails with results difference
+ rpl_killed_ddl           : Bug#45520: rpl_killed_ddl fails sporadically in pb2
 +#
 +plugin_load         : gives wrong answer on PPC64
 +outfile_loaddata    : gives different results on different platforms
diff --git a/mysql.spec b/mysql.spec
index 7e53ba8..b8726bd 100644
--- a/mysql.spec
+++ b/mysql.spec
@@ -1,5 +1,5 @@
 Name: mysql
-Version: 5.1.40
+Version: 5.1.41
 Release: 1%{?dist}
 Summary: MySQL client programs and shared libraries
 Group: Applications/Databases
@@ -649,6 +649,12 @@ fi
 %{_mandir}/man1/mysql_client_test.1*
 
 %changelog
+* Mon Nov 23 2009 Tom Lane <tgl@redhat.com> 5.1.41-1
+- Update to MySQL 5.1.41, for various fixes described at
+  http://dev.mysql.com/doc/refman/5.1/en/news-5-1-41.html
+- Don't set old_passwords=1; we aren't being bug-compatible with 3.23 anymore
+Resolves: #540735
+
 * Tue Nov 10 2009 Tom Lane <tgl@redhat.com> 5.1.40-1
 - Update to MySQL 5.1.40, for various fixes described at
   http://dev.mysql.com/doc/refman/5.1/en/news-5-1-40.html
diff --git a/sources b/sources
index aebe584..c9d4caa 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-32e7373c16271606007374396e6742ad  mysql-5.1.40.tar.gz
+b5d39e8789174753f3c782959729e68c  mysql-5.1.41.tar.gz