rpms/mysql/F-11 mysql-strmov.patch, NONE, 1.1 .cvsignore, 1.41, 1.42 mysql-ndb-stacksize.patch, 1.1, 1.2 mysql-plugin-bug.patch, 1.9, 1.10 mysql-testing.patch, 1.13, 1.14 mysql.spec, 1.122, 1.123 sources, 1.41, 1.42
Tom Lane
tgl at fedoraproject.org
Mon Sep 28 03:24:26 UTC 2009
Author: tgl
Update of /cvs/pkgs/rpms/mysql/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12557
Modified Files:
.cvsignore mysql-ndb-stacksize.patch mysql-plugin-bug.patch
mysql-testing.patch mysql.spec sources
Added Files:
mysql-strmov.patch
Log Message:
Update to MySQL 5.1.39
mysql-strmov.patch:
m_string.h | 7 -------
1 file changed, 7 deletions(-)
--- NEW FILE mysql-strmov.patch ---
Remove overly optimistic definition of strmov() as stpcpy().
mysql uses this macro with overlapping source and destination strings,
which is verboten per spec, and fails on some Red Hat platforms.
Deleting the definition is sufficient to make it fall back to a
byte-at-a-time copy loop, which should consistently give the
expected behavior.
diff -Naur mysql-5.1.37.orig/include/m_string.h mysql-5.1.37/include/m_string.h
--- mysql-5.1.37.orig/include/m_string.h 2009-07-13 19:08:50.000000000 -0400
+++ mysql-5.1.37/include/m_string.h 2009-08-31 21:49:49.000000000 -0400
@@ -81,13 +81,6 @@
extern void *(*my_str_malloc)(size_t);
extern void (*my_str_free)(void *);
-#if defined(HAVE_STPCPY)
-#define strmov(A,B) stpcpy((A),(B))
-#ifndef stpcpy
-extern char *stpcpy(char *, const char *); /* For AIX with gcc 2.95.3 */
-#endif
-#endif
-
/* Declared in int2str() */
extern char NEAR _dig_vec_upper[];
extern char NEAR _dig_vec_lower[];
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mysql/F-11/.cvsignore,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- .cvsignore 3 Aug 2009 02:29:35 -0000 1.41
+++ .cvsignore 28 Sep 2009 03:24:24 -0000 1.42
@@ -1 +1 @@
-mysql-5.1.37.tar.gz
+mysql-5.1.39.tar.gz
mysql-ndb-stacksize.patch:
AsyncFile.cpp | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
Index: mysql-ndb-stacksize.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mysql/F-11/mysql-ndb-stacksize.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mysql-ndb-stacksize.patch 15 Apr 2009 22:07:42 -0000 1.1
+++ mysql-ndb-stacksize.patch 28 Sep 2009 03:24:24 -0000 1.2
@@ -11,17 +11,21 @@ elsewhere. At some point we might want
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++;
mysql-plugin-bug.patch:
disabled.def | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
Index: mysql-plugin-bug.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mysql/F-11/mysql-plugin-bug.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- mysql-plugin-bug.patch 3 Aug 2009 02:29:35 -0000 1.9
+++ mysql-plugin-bug.patch 28 Sep 2009 03:24:24 -0000 1.10
@@ -6,14 +6,19 @@ http://bugs.mysql.com/bug.php?id=42144
For the moment, just disable this test.
+Also, disable the outfile_loaddata test, which as of 5.1.38 is giving
+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.37.orig/mysql-test/t/disabled.def mysql-5.1.37/mysql-test/t/disabled.def
---- mysql-5.1.37.orig/mysql-test/t/disabled.def 2009-07-13 19:43:47.000000000 -0400
-+++ mysql-5.1.37/mysql-test/t/disabled.def 2009-08-02 20:43:36.000000000 -0400
-@@ -13,4 +13,5 @@
+
+diff -Naur mysql-5.1.39.orig/mysql-test/t/disabled.def mysql-5.1.39/mysql-test/t/disabled.def
+--- mysql-5.1.39.orig/mysql-test/t/disabled.def 2009-09-04 13:01:56.000000000 -0400
++++ mysql-5.1.39/mysql-test/t/disabled.def 2009-09-23 19:23:42.000000000 -0400
+@@ -13,4 +13,6 @@
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"
query_cache_28249 : Bug#43861 2009-03-25 main.query_cache_28249 fails sporadically
init_connect : Bug#44920 2009-07-06 pcrews MTR not processing master.opt input properly on Windows. *Must be done this way due to the nature of the bug*
-
+#
-+plugin_load : gives wrong answer on PPC64
++plugin_load : gives wrong answer on PPC64
++outfile_loaddata : gives different results on different platforms
mysql-testing.patch:
Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: mysql-testing.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mysql/F-11/mysql-testing.patch,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- mysql-testing.patch 5 Mar 2009 02:50:07 -0000 1.13
+++ mysql-testing.patch 28 Sep 2009 03:24:24 -0000 1.14
@@ -1,6 +1,13 @@
Hack the top-level Makefile to enable the openssl regression tests.
(Why doesn't this happen automatically given the configure option??)
+Also, increase the overall timeout for the regression tests to 12 hours,
+because on a slow or heavily-loaded build machine sometimes the default of
+5 hours isn't enough. (This has been demonstrated to fail in mass-rebuild
+scenarios, which aren't that uncommon for Fedora.) Similarly increase the
+per-testcase timeout to 30 minutes, since the default of 15 hasn't got a
+great deal of headroom either.
+
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
@@ -10,7 +17,7 @@ diff -Naur mysql-5.1.32.orig/Makefile.am
test-ns:
cd mysql-test ; \
- @PERL@ ./mysql-test-run.pl $(force) $(mem) --mysqld=--binlog-format=mixed
-+ @PERL@ ./mysql-test-run.pl $(force) $(mem) --ssl --mysqld=--binlog-format=mixed
++ @PERL@ ./mysql-test-run.pl $(force) $(mem) --ssl --mysqld=--binlog-format=mixed --suite-timeout=720 --testcase-timeout=30
test-binlog-statement:
cd mysql-test ; \
Index: mysql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mysql/F-11/mysql.spec,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -p -r1.122 -r1.123
--- mysql.spec 3 Aug 2009 02:29:35 -0000 1.122
+++ mysql.spec 28 Sep 2009 03:24:25 -0000 1.123
@@ -1,6 +1,6 @@
Name: mysql
-Version: 5.1.37
-Release: 1%{?dist}
+Version: 5.1.39
+Release: 2%{?dist}
Summary: MySQL client programs and shared libraries
Group: Applications/Databases
URL: http://www.mysql.com
@@ -32,6 +32,7 @@ Patch6: mysql-stack-guard.patch
Patch7: mysql-plugin-bug.patch
Patch8: mysql-setschedparam.patch
Patch9: mysql-ndb-stacksize.patch
+Patch10: mysql-strmov.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: gperf, perl, readline-devel, openssl-devel
@@ -174,6 +175,7 @@ the MySQL sources.
%patch7 -p1
%patch8 -p1
%patch9 -p1
+%patch10 -p1
libtoolize --force
aclocal
@@ -205,13 +207,13 @@ export CFLAGS CXXFLAGS
--with-mysqld-user="mysql" \
--with-extra-charsets=all \
--with-big-tables \
- --with-innodb \
- --with-ndbcluster \
+ --with-pic \
+ --with-plugin-innobase \
+ --with-plugin-ndbcluster \
--enable-local-infile \
--enable-largefile \
--enable-thread-safe-client \
- --disable-dependency-tracking \
- --with-named-thread-libs="-lpthread"
+ --disable-dependency-tracking
gcc $CFLAGS $LDFLAGS -o scriptstub "-DLIBDIR=\"%{_libdir}/mysql\"" %{SOURCE4}
@@ -249,6 +251,7 @@ make check
# note: "make test" invokes two largely-duplicate sets of tests,
# which makes the runtime really unacceptably long ...
+ # if you want to change this, look at mysql-testing.patch too.
make test-ns
%endif
@@ -639,6 +642,11 @@ fi
%{_mandir}/man1/mysql_client_test.1*
%changelog
+* Sun Sep 27 2009 Tom Lane <tgl at redhat.com> 5.1.39-2
+- 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
+- Sync with F-12 release 5.1.39-2
+
* Sun Aug 2 2009 Tom Lane <tgl at redhat.com> 5.1.37-1
- Update to MySQL 5.1.37, for various fixes described at
http://dev.mysql.com/doc/refman/5.1/en/news-5-1-37.html
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mysql/F-11/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- sources 3 Aug 2009 02:29:35 -0000 1.41
+++ sources 28 Sep 2009 03:24:25 -0000 1.42
@@ -1 +1 @@
-cbdb8783b053019755ee9196f67ea04c mysql-5.1.37.tar.gz
+55a398daeb69a778fc46573623143268 mysql-5.1.39.tar.gz
More information about the fedora-extras-commits
mailing list