diff --git a/mysql-rpl-test.patch b/mysql-rpl-test.patch new file mode 100644 index 0000000..8415800 --- /dev/null +++ b/mysql-rpl-test.patch @@ -0,0 +1,24 @@ +This patch improves the stability of the mysql regression tests on Red Hat's +build servers. I really have no idea why ... it is probably masking a +bug in mysqld, but without a better handle on how to reproduce the problem, +it's tough to make a bug report. Worth noting is that rpl000001 passes +fine when run by itself, or with the immediately preceding tests; but fails +when the complete test series is run. + + +diff -Naur mysql-5.0.18.orig/mysql-test/r/rpl000001.result mysql-5.0.18/mysql-test/r/rpl000001.result +--- mysql-5.0.18.orig/mysql-test/r/rpl000001.result 2005-12-21 14:50:25.000000000 -0500 ++++ mysql-5.0.18/mysql-test/r/rpl000001.result 2006-01-05 01:57:17.000000000 -0500 +@@ -1,3 +1,4 @@ ++flush privileges; + stop slave; + drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; + reset master; +diff -Naur mysql-5.0.18.orig/mysql-test/t/rpl000001.test mysql-5.0.18/mysql-test/t/rpl000001.test +--- mysql-5.0.18.orig/mysql-test/t/rpl000001.test 2005-12-21 14:50:25.000000000 -0500 ++++ mysql-5.0.18/mysql-test/t/rpl000001.test 2006-01-05 01:57:15.000000000 -0500 +@@ -1,3 +1,4 @@ ++flush privileges; + source include/master-slave.inc; + + create table t1 (word char(20) not null); diff --git a/mysql.spec b/mysql.spec index 1a41c90..b5228ab 100644 --- a/mysql.spec +++ b/mysql.spec @@ -23,6 +23,7 @@ Patch3: mysql-libtool.patch Patch4: mysql-testing.patch Patch5: mysql-no-atomic.patch Patch6: mysql-rpl_ddl.patch +Patch7: mysql-rpl-test.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root Prereq: /sbin/ldconfig, /sbin/install-info, grep, fileutils, chkconfig @@ -98,6 +99,7 @@ MySQL. %patch4 -p1 %patch5 -p1 %patch6 -p1 +%patch7 -p1 libtoolize --force aclocal @@ -378,7 +380,7 @@ fi %{_datadir}/sql-bench %changelog -* Wed Jan 4 2006 Tom Lane 5.0.18-1 +* Thu Jan 5 2006 Tom Lane 5.0.18-1 - Update to MySQL 5.0.18 * Thu Dec 15 2005 Tom Lane 5.0.16-4