rpms/mysql/F-13 .cvsignore, 1.50, 1.51 mysql-plugin-bug.patch, 1.18, 1.19 mysql.init, 1.29, 1.30 mysql.spec, 1.152, 1.153 sources, 1.50, 1.51

Tom Lane tgl at fedoraproject.org
Wed Jul 14 02:23:10 UTC 2010


Author: tgl

Update of /cvs/pkgs/rpms/mysql/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv1733

Modified Files:
	.cvsignore mysql-plugin-bug.patch mysql.init mysql.spec 
	sources 
Log Message:
Update to 5.1.48; other minor fixes to sync with rawhide


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mysql/F-13/.cvsignore,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- .cvsignore	24 May 2010 16:21:47 -0000	1.50
+++ .cvsignore	14 Jul 2010 02:23:10 -0000	1.51
@@ -1 +1 @@
-mysql-5.1.47-nodocs.tar.gz
+mysql-5.1.48-nodocs.tar.gz

mysql-plugin-bug.patch:
 disabled.def |    3 +++
 1 file changed, 3 insertions(+)

Index: mysql-plugin-bug.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mysql/F-13/mysql-plugin-bug.patch,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- mysql-plugin-bug.patch	24 May 2010 16:21:47 -0000	1.18
+++ mysql-plugin-bug.patch	14 Jul 2010 02:23:10 -0000	1.19
@@ -11,13 +11,13 @@ platform-dependent results, with the "ex
 wrong ones.  This is upstream at http://bugs.mysql.com/bug.php?id=46895
 
 
-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 @@
+diff -Naur mysql-5.1.48.orig/mysql-test/t/disabled.def mysql-5.1.48/mysql-test/t/disabled.def
+--- mysql-5.1.48.orig/mysql-test/t/disabled.def	2010-06-03 12:17:34.000000000 -0400
++++ mysql-5.1.48/mysql-test/t/disabled.def	2010-06-20 23:49:47.317995474 -0400
+@@ -12,3 +12,6 @@
+ kill                     : Bug#37780 2008-12-03 HHunger need some changes to be robust enough for pushbuild.
  query_cache_28249        : Bug#43861 2009-03-25 main.query_cache_28249 fails sporadically
  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


Index: mysql.init
===================================================================
RCS file: /cvs/pkgs/rpms/mysql/F-13/mysql.init,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- mysql.init	22 Feb 2010 02:56:08 -0000	1.29
+++ mysql.init	14 Jul 2010 02:23:10 -0000	1.30
@@ -19,6 +19,10 @@
 exec="/usr/bin/mysqld_safe"
 prog="mysqld"
 
+# Set timeouts here so they can be overridden from /etc/sysconfig/mysqld
+STARTTIMEOUT=120
+STOPTIMEOUT=60
+
 [ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
 
 lockfile=/var/lock/subsys/$prog
@@ -101,8 +105,8 @@ start(){
 	# Rather than assuming we know a valid username, accept an "access
 	# denied" response as meaning the server is functioning.
 	ret=0
-	STARTTIMEOUT=120
-	while [ $STARTTIMEOUT -gt 0 ]; do
+	TIMEOUT="$STARTTIMEOUT"
+	while [ $TIMEOUT -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
 	    if ! /bin/kill -0 $safe_pid 2>/dev/null; then
@@ -111,9 +115,9 @@ start(){
 		break
 	    fi
 	    sleep 1
-	    let STARTTIMEOUT=${STARTTIMEOUT}-1
+	    let TIMEOUT=${TIMEOUT}-1
 	done
-	if [ $STARTTIMEOUT -eq 0 ]; then
+	if [ $TIMEOUT -eq 0 ]; then
 	    echo "Timeout error occurred trying to start MySQL Daemon."
 	    ret=1
 	fi
@@ -138,13 +142,13 @@ stop(){
 	    /bin/kill "$MYSQLPID" >/dev/null 2>&1
 	    ret=$?
 	    if [ $ret -eq 0 ]; then
-		STOPTIMEOUT=60
-		while [ $STOPTIMEOUT -gt 0 ]; do
+		TIMEOUT="$STOPTIMEOUT"
+		while [ $TIMEOUT -gt 0 ]; do
 		    /bin/kill -0 "$MYSQLPID" >/dev/null 2>&1 || break
 		    sleep 1
-		    let STOPTIMEOUT=${STOPTIMEOUT}-1
+		    let TIMEOUT=${TIMEOUT}-1
 		done
-		if [ $STOPTIMEOUT -eq 0 ]; then
+		if [ $TIMEOUT -eq 0 ]; then
 		    echo "Timeout error occurred trying to stop MySQL Daemon."
 		    ret=1
 		    action $"Stopping $prog: " /bin/false


Index: mysql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mysql/F-13/mysql.spec,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -p -r1.152 -r1.153
--- mysql.spec	4 Jun 2010 21:20:41 -0000	1.152
+++ mysql.spec	14 Jul 2010 02:23:10 -0000	1.153
@@ -1,5 +1,5 @@
 Name: mysql
-Version: 5.1.47
+Version: 5.1.48
 Release: 2%{?dist}
 Summary: MySQL client programs and shared libraries
 Group: Applications/Databases
@@ -354,7 +354,7 @@ rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/m
 mkdir -p $RPM_BUILD_ROOT/etc/ld.so.conf.d
 echo "%{_libdir}/mysql" > $RPM_BUILD_ROOT/etc/ld.so.conf.d/%{name}-%{_arch}.conf
 
-# copy additional docs into build tree so %doc will find them
+# copy additional docs into build tree so %%doc will find them
 cp %{SOURCE6} README.mysql-docs
 
 %clean
@@ -428,11 +428,10 @@ fi
 
 %files libs
 %defattr(-,root,root)
-
+%doc COPYING EXCEPTIONS-CLIENT
 # although the default my.cnf contains only server settings, we put it in the
 # libs package because it can be used for client settings too.
 %config(noreplace) /etc/my.cnf
-
 %dir %{_libdir}/mysql
 %{_libdir}/mysql/libmysqlclient*.so.*
 /etc/ld.so.conf.d/*
@@ -552,6 +551,7 @@ fi
 
 %files embedded
 %defattr(-,root,root)
+%doc COPYING EXCEPTIONS-CLIENT
 %{_libdir}/mysql/libmysqld.so.*
 
 %files embedded-devel
@@ -574,6 +574,19 @@ fi
 %{_mandir}/man1/mysql_client_test.1*
 
 %changelog
+* Tue Jul 13 2010 Tom Lane <tgl at redhat.com> 5.1.48-2
+- Duplicate COPYING and EXCEPTIONS-CLIENT in -libs and -embedded subpackages,
+  to ensure they are available when any subset of mysql RPMs are installed,
+  per revised packaging guidelines
+- Allow init script's STARTTIMEOUT/STOPTIMEOUT to be overridden from sysconfig
+Related: #609734
+
+* Mon Jun 21 2010 Tom Lane <tgl at redhat.com> 5.1.48-1
+- Update to MySQL 5.1.48, for various fixes described at
+  http://dev.mysql.com/doc/refman/5.1/en/news-5-1-48.html
+  including a fix for CVE-2010-2008
+Related: #614214
+
 * Fri Jun  4 2010 Tom Lane <tgl at redhat.com> 5.1.47-2
 - Add back "partition" storage engine
 Resolves: #597390


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mysql/F-13/sources,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- sources	24 May 2010 16:21:47 -0000	1.50
+++ sources	14 Jul 2010 02:23:10 -0000	1.51
@@ -1 +1 @@
-db89a1bb8b7e7002a3653d144d5abbdc  mysql-5.1.47-nodocs.tar.gz
+f7bda6d4c8a2acad2e051089bfcc2352  mysql-5.1.48-nodocs.tar.gz



More information about the scm-commits mailing list