From aab815016fe0de0b306d5555f90097b77d9c322d Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@fedoraproject.org>
Date: Mon, 24 May 2010 16:17:16 +0000
Subject: [PATCH] Update to MySQL 5.1.47

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

diff --git a/.cvsignore b/.cvsignore
index 65a2628..60f6c2b 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-mysql-5.1.46-nodocs.tar.gz
+mysql-5.1.47-nodocs.tar.gz
diff --git a/mysql-plugin-bug.patch b/mysql-plugin-bug.patch
index 72546ec..f90e81c 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.44.orig/mysql-test/t/disabled.def mysql-5.1.44/mysql-test/t/disabled.def
---- mysql-5.1.44.orig/mysql-test/t/disabled.def	2010-02-04 07:07:08.000000000 -0500
-+++ mysql-5.1.44/mysql-test/t/disabled.def	2010-02-19 21:16:15.000000000 -0500
-@@ -12,3 +12,6 @@
- kill                     : Bug#37780 2008-12-03 HHunger need some changes to be robust enough for pushbuild.
+diff -Naur mysql-5.1.47.orig/mysql-test/t/disabled.def mysql-5.1.47/mysql-test/t/disabled.def
+--- mysql-5.1.47.orig/mysql-test/t/disabled.def	2010-05-06 11:58:11.000000000 -0400
++++ mysql-5.1.47/mysql-test/t/disabled.def	2010-05-24 11:16:14.000000000 -0400
+@@ -13,3 +13,6 @@
  query_cache_28249        : Bug#43861 2009-03-25 main.query_cache_28249 fails sporadically
- innodb-autoinc-44030     : BUG#47621 2009-01-22 svoj MySQL and InnoDB dicts getting out of sync
+ partition_innodb_plugin  : Bug#53307 2010-04-30 VasilDimov valgrind warnings
+ ps_3innodb               : Bug#53309 2010-04-30 VasilDimov valgrind warnings
 +#
 +plugin_load         : gives wrong answer on PPC64
 +outfile_loaddata    : gives different results on different platforms
diff --git a/mysql.spec b/mysql.spec
index 350970f..ef02a2b 100644
--- a/mysql.spec
+++ b/mysql.spec
@@ -1,5 +1,5 @@
 Name: mysql
-Version: 5.1.46
+Version: 5.1.47
 Release: 1%{?dist}
 Summary: MySQL client programs and shared libraries
 Group: Applications/Databases
@@ -356,8 +356,9 @@ cp %{SOURCE6} README.mysql-docs
 rm -rf $RPM_BUILD_ROOT
 
 %pre server
-/usr/sbin/useradd -M -o -r -d /var/lib/mysql -s /bin/bash \
-	-c "MySQL Server" -u 27 mysql > /dev/null 2>&1 || :
+/usr/sbin/groupadd -g 27 -o -r mysql >/dev/null 2>&1 || :
+/usr/sbin/useradd -M -N -g mysql -o -r -d /var/lib/mysql -s /bin/bash \
+	-c "MySQL Server" -u 27 mysql >/dev/null 2>&1 || :
 
 %post libs
 /sbin/ldconfig
@@ -568,6 +569,15 @@ fi
 %{_mandir}/man1/mysql_client_test.1*
 
 %changelog
+* Mon May 24 2010 Tom Lane <tgl@redhat.com> 5.1.47-1
+- Update to MySQL 5.1.47, for various fixes described at
+  http://dev.mysql.com/doc/refman/5.1/en/news-5-1-47.html
+  including fixes for CVE-2010-1848, CVE-2010-1849, CVE-2010-1850
+Resolves: #592862
+Resolves: #583717
+- Create mysql group explicitly in pre-server script, to ensure correct GID
+Related: #594155
+
 * Sat Apr 24 2010 Tom Lane <tgl@redhat.com> 5.1.46-1
 - Update to MySQL 5.1.46, for various fixes described at
   http://dev.mysql.com/doc/refman/5.1/en/news-5-1-46.html
diff --git a/sources b/sources
index f5d518b..ab3cff9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-57ee8b562779f5a0ba1e9e3270c579a4  mysql-5.1.46-nodocs.tar.gz
+db89a1bb8b7e7002a3653d144d5abbdc  mysql-5.1.47-nodocs.tar.gz