rpms/mysql/devel .cvsignore, 1.35, 1.36 filter-requires-mysql.sh, 1.4, 1.5 mysql-errno.patch, 1.5, 1.6 mysql-install-test.patch, 1.7, 1.8 mysql-plugin-bug.patch, 1.3, 1.4 mysql-testing.patch, 1.12, 1.13 mysql.spec, 1.115, 1.116 sources, 1.35, 1.36 mysql-expired-certs.patch, 1.3, NONE
Tom Lane
tgl at fedoraproject.org
Thu Mar 5 02:50:38 UTC 2009
Author: tgl
Update of /cvs/pkgs/rpms/mysql/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25668
Modified Files:
.cvsignore filter-requires-mysql.sh mysql-errno.patch
mysql-install-test.patch mysql-plugin-bug.patch
mysql-testing.patch mysql.spec sources
Removed Files:
mysql-expired-certs.patch
Log Message:
Update to MySQL 5.1.32
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mysql/devel/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- .cvsignore 13 Feb 2009 21:22:22 -0000 1.35
+++ .cvsignore 5 Mar 2009 02:50:07 -0000 1.36
@@ -1 +1 @@
-mysql-5.1.31.tar.gz
+mysql-5.1.32.tar.gz
Index: filter-requires-mysql.sh
===================================================================
RCS file: /cvs/pkgs/rpms/mysql/devel/filter-requires-mysql.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- filter-requires-mysql.sh 3 May 2006 03:36:47 -0000 1.4
+++ filter-requires-mysql.sh 5 Mar 2009 02:50:07 -0000 1.5
@@ -1,3 +1,3 @@
#!/bin/sh
-/usr/lib/rpm/perl.req $* | grep -v -e "perl(th" -e "perl(lib::mtr"
+/usr/lib/rpm/perl.req $* | grep -v -e "perl(th" -e "perl(lib::mtr" -e "perl(mtr"
mysql-errno.patch:
Index: mysql-errno.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mysql/devel/mysql-errno.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mysql-errno.patch 14 Jan 2009 17:10:05 -0000 1.5
+++ mysql-errno.patch 5 Mar 2009 02:50:07 -0000 1.6
@@ -1,10 +1,10 @@
"extern int errno" is just a really bad idea.
-diff -Naur mysql-5.1.30.orig/include/my_sys.h mysql-5.1.30/include/my_sys.h
---- mysql-5.1.30.orig/include/my_sys.h 2008-11-14 11:34:35.000000000 -0500
-+++ mysql-5.1.30/include/my_sys.h 2009-01-13 11:04:15.000000000 -0500
-@@ -201,13 +201,8 @@
+diff -Naur mysql-5.1.32.orig/include/my_sys.h mysql-5.1.32/include/my_sys.h
+--- mysql-5.1.32.orig/include/my_sys.h 2009-02-13 19:52:19.000000000 -0500
++++ mysql-5.1.32/include/my_sys.h 2009-03-04 18:08:40.000000000 -0500
+@@ -199,13 +199,8 @@
#define my_afree(PTR) my_free(PTR,MYF(MY_WME))
#endif /* HAVE_ALLOCA */
@@ -16,6 +16,6 @@
-#endif
-#endif /* #ifndef errno */
+
- extern char NEAR errbuff[NRERRBUFFS][ERRMSGSIZE];
extern char *home_dir; /* Home directory for user */
extern const char *my_progname; /* program-name (printed in errors) */
+ extern char NEAR curr_dir[]; /* Current directory for user */
mysql-install-test.patch:
Index: mysql-install-test.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mysql/devel/mysql-install-test.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- mysql-install-test.patch 14 Jan 2009 17:10:05 -0000 1.7
+++ mysql-install-test.patch 5 Mar 2009 02:50:07 -0000 1.8
@@ -1,6 +1,6 @@
mysql's idea of a suitable place to install the regression tests is
/usr/mysql-test. To relocate this to a reasonably FHS-compliant place
-like /usr/share/mysql-test, we have to hack up the paths in install_test_db.
+like /usr/share/mysql-test, we have to hack up the paths in mtr_cases.pm.
This patch also improves the documentation a tad.
@@ -37,41 +37,17 @@
You can create your own test cases. To create a test case, create a new
-diff -Naur mysql-5.1.30.orig/mysql-test/install_test_db.sh mysql-5.1.30/mysql-test/install_test_db.sh
---- mysql-5.1.30.orig/mysql-test/install_test_db.sh 2008-11-14 11:34:47.000000000 -0500
-+++ mysql-5.1.30/mysql-test/install_test_db.sh 2009-01-13 11:30:00.000000000 -0500
-@@ -26,18 +26,15 @@
- libexecdir=../libexec
-
- # Check if it's a binary distribution or a 'make install'
-- if test -x ../libexec/mysqld
-+ if test -x /usr/libexec/mysqld
- then
-- execdir=../libexec
-- elif test -x ../../sbin/mysqld # RPM installation
-- then
-- execdir=../../sbin
-- bindir=../../bin
-- scriptdir=../bin
-- libexecdir=../../libexec
-+ execdir=/usr/libexec
- else
-- execdir=../bin
-+ execdir=/usr/bin
- fi
-+ bindir=/usr/bin
-+ scriptdir=/usr/bin
-+ libexecdir=/usr/libexec
- fix_bin=mysql-test
- else
- execdir=../sql
-@@ -96,7 +93,8 @@
-
- #for error messages
- if [ x$BINARY_DIST = x1 ] ; then
--basedir=..
-+basedir=/usr/share
-+EXTRA_ARG="--language=/usr/share/mysql/english/ --character-sets-dir=/usr/share/mysql/charsets/"
- else
- basedir=.
- EXTRA_ARG="--windows"
+diff -Naur mysql-5.1.32.orig/mysql-test/lib/mtr_cases.pm mysql-5.1.32/mysql-test/lib/mtr_cases.pm
+--- mysql-5.1.32.orig/mysql-test/lib/mtr_cases.pm 2009-02-13 19:52:34.000000000 -0500
++++ mysql-5.1.32/mysql-test/lib/mtr_cases.pm 2009-03-04 20:34:23.000000000 -0500
+@@ -228,7 +228,9 @@
+ else
+ {
+ $suitedir= my_find_dir($::basedir,
+- ["mysql-test/suite",
++ ["share/mysql-test/suite",
++ "share/mysql-test",
++ "mysql-test/suite",
+ "mysql-test",
+ # Look in storage engine specific suite dirs
+ "storage/*/mysql-test-suites"
mysql-plugin-bug.patch:
Index: mysql-plugin-bug.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mysql/devel/mysql-plugin-bug.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mysql-plugin-bug.patch 13 Feb 2009 21:22:22 -0000 1.3
+++ mysql-plugin-bug.patch 5 Mar 2009 02:50:07 -0000 1.4
@@ -7,12 +7,12 @@
For the moment, just disable this test.
-diff -Naur mysql-5.1.31.orig/mysql-test/t/disabled.def mysql-5.1.31/mysql-test/t/disabled.def
---- mysql-5.1.31.orig/mysql-test/t/disabled.def 2009-01-19 12:11:19.000000000 -0500
-+++ mysql-5.1.31/mysql-test/t/disabled.def 2009-02-13 14:23:55.000000000 -0500
-@@ -14,3 +14,5 @@
- wait_timeout_func : Bug #41225 joro wait_timeout_func fails
+diff -Naur mysql-5.1.32.orig/mysql-test/t/disabled.def mysql-5.1.32/mysql-test/t/disabled.def
+--- mysql-5.1.32.orig/mysql-test/t/disabled.def 2009-02-13 20:34:40.000000000 -0500
++++ mysql-5.1.32/mysql-test/t/disabled.def 2009-03-04 18:48:34.000000000 -0500
+@@ -12,3 +12,5 @@
kill : Bug#37780 2008-12-03 HHunger need some changes to be robust enough for pushbuild.
query_cache_28249 : Bug#41098 Query Cache returns wrong result with concurrent insert
+ 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"
+#
+plugin_load : gives wrong answer on PPC64
mysql-testing.patch:
Index: mysql-testing.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mysql/devel/mysql-testing.patch,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- mysql-testing.patch 14 Jan 2009 17:10:05 -0000 1.12
+++ mysql-testing.patch 5 Mar 2009 02:50:07 -0000 1.13
@@ -1,14 +1,10 @@
Hack the top-level Makefile to enable the openssl regression tests.
(Why doesn't this happen automatically given the configure option??)
-Also, tweak the Perl test script so that the mysqld daemon gets detached
-from the calling terminal session. Without this, the ssl_des test hangs up
-because OpenSSL tries to read a PEM key from /dev/tty.
-
-diff -Naur mysql-5.1.30.orig/Makefile.am mysql-5.1.30/Makefile.am
---- mysql-5.1.30.orig/Makefile.am 2008-11-14 11:34:15.000000000 -0500
-+++ mysql-5.1.30/Makefile.am 2009-01-13 11:13:12.000000000 -0500
+diff -Naur mysql-5.1.32.orig/Makefile.am mysql-5.1.32/Makefile.am
+--- mysql-5.1.32.orig/Makefile.am 2009-02-13 19:51:56.000000000 -0500
++++ mysql-5.1.32/Makefile.am 2009-03-04 18:12:36.000000000 -0500
@@ -98,7 +98,7 @@
test-ns:
@@ -18,28 +14,3 @@
test-binlog-statement:
cd mysql-test ; \
-diff -Naur mysql-5.1.30.orig/mysql-test/lib/mtr_process.pl mysql-5.1.30/mysql-test/lib/mtr_process.pl
---- mysql-5.1.30.orig/mysql-test/lib/mtr_process.pl 2008-11-14 12:31:10.000000000 -0500
-+++ mysql-5.1.30/mysql-test/lib/mtr_process.pl 2009-01-13 11:14:25.000000000 -0500
-@@ -150,6 +150,9 @@
- {
- # Child, redirect output and exec
-
-+ # Needed to become detached from terminal session
-+ POSIX::setsid();
-+
- $SIG{INT}= 'DEFAULT'; # Parent do some stuff, we don't
-
- my $log_file_open_mode = '>';
-diff -Naur mysql-5.1.30.orig/mysql-test/mysql-test-run.pl mysql-5.1.30/mysql-test/mysql-test-run.pl
---- mysql-5.1.30.orig/mysql-test/mysql-test-run.pl 2008-11-14 11:34:48.000000000 -0500
-+++ mysql-5.1.30/mysql-test/mysql-test-run.pl 2009-01-13 11:17:52.000000000 -0500
-@@ -4204,7 +4204,7 @@
-
- if ( defined $exe )
- {
-- $pid= mtr_spawn($exe, $args, "",
-+ $pid= mtr_spawn($exe, $args, '/dev/null',
- $mysqld->{'path_myerr'},
- $mysqld->{'path_myerr'},
- "",
Index: mysql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mysql/devel/mysql.spec,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- mysql.spec 26 Feb 2009 03:36:50 -0000 1.115
+++ mysql.spec 5 Mar 2009 02:50:07 -0000 1.116
@@ -1,6 +1,6 @@
Name: mysql
-Version: 5.1.31
-Release: 2%{?dist}
+Version: 5.1.32
+Release: 1%{?dist}
Summary: MySQL client programs and shared libraries
Group: Applications/Databases
URL: http://www.mysql.com
@@ -29,8 +29,7 @@
Patch4: mysql-testing.patch
Patch5: mysql-install-test.patch
Patch6: mysql-stack-guard.patch
-Patch7: mysql-expired-certs.patch
-Patch8: mysql-plugin-bug.patch
+Patch7: mysql-plugin-bug.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: gperf, perl, readline-devel, openssl-devel
@@ -171,7 +170,6 @@
%patch5 -p1
%patch6 -p1
%patch7 -p1
-%patch8 -p1
libtoolize --force
aclocal
@@ -287,6 +285,8 @@
rm -f $RPM_BUILD_ROOT/%{_infodir}/dir*
mv $RPM_BUILD_ROOT/usr/sql-bench $RPM_BUILD_ROOT%{_datadir}/sql-bench
mv $RPM_BUILD_ROOT/usr/mysql-test $RPM_BUILD_ROOT%{_datadir}/mysql-test
+# 5.1.32 forgets to install the mysql-test README file
+install -m 0644 mysql-test/README $RPM_BUILD_ROOT%{_datadir}/mysql-test/README
mv ${RPM_BUILD_ROOT}%{_bindir}/mysqlbug ${RPM_BUILD_ROOT}%{_libdir}/mysql/mysqlbug
install -m 0755 scriptstub ${RPM_BUILD_ROOT}%{_bindir}/mysqlbug
@@ -635,6 +635,9 @@
%{_mandir}/man1/mysql_client_test.1*
%changelog
+* Wed Mar 4 2009 Tom Lane <tgl at redhat.com> 5.1.32-1
+- Update to MySQL 5.1.32.
+
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.1.31-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mysql/devel/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- sources 13 Feb 2009 21:22:22 -0000 1.35
+++ sources 5 Mar 2009 02:50:07 -0000 1.36
@@ -1 +1 @@
-a077387e04ea24e67a93cff5f05bc3ba mysql-5.1.31.tar.gz
+f2d14b5e3b9d50b809c9b9985e4513b7 mysql-5.1.32.tar.gz
--- mysql-expired-certs.patch DELETED ---
More information about the fedora-extras-commits
mailing list