rpms/mysql/devel mysql-rpl_ddl.patch,NONE,1.1 mysql.spec,1.59,1.60

[fedora-cvs-commits at redhat.com]

Author: tgl

Update of /cvs/dist/rpms/mysql/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3483

Modified Files:
	mysql.spec 
Added Files:
	mysql-rpl_ddl.patch 
Log Message:
Work around a regression test problem.

mysql-rpl_ddl.patch:
 r/rpl_ddl.result |    1 +
 t/rpl_ddl.test   |    4 ++++
 2 files changed, 5 insertions(+)

--- NEW FILE mysql-rpl_ddl.patch ---
diff -Naur mysql-5.0.15.orig/mysql-test/r/rpl_ddl.result mysql-5.0.15/mysql-test/r/rpl_ddl.result
--- mysql-5.0.15.orig/mysql-test/r/rpl_ddl.result	2005-10-16 21:37:08.000000000 -0400
+++ mysql-5.0.15/mysql-test/r/rpl_ddl.result	2005-11-03 17:28:30.000000000 -0500
@@ -1688,6 +1688,7 @@
 -------- switch to slave -------
 SELECT user FROM mysql.user WHERE user = 'rename1';
 user
+flush privileges;
 DROP DATABASE IF EXISTS mysqltest1;
 DROP DATABASE IF EXISTS mysqltest2;
 DROP DATABASE IF EXISTS mysqltest3;
diff -Naur mysql-5.0.15.orig/mysql-test/t/rpl_ddl.test mysql-5.0.15/mysql-test/t/rpl_ddl.test
--- mysql-5.0.15.orig/mysql-test/t/rpl_ddl.test	2005-10-16 21:37:08.000000000 -0400
+++ mysql-5.0.15/mysql-test/t/rpl_ddl.test	2005-11-03 17:28:28.000000000 -0500
@@ -498,6 +498,10 @@
 SELECT user FROM mysql.user WHERE user = 'rename1';
 connection master;
 
+# Needed to avoid failure in next test on some platforms ...
+# this probably indicates an underlying MySQL bug ...
+flush privileges;
+
 ###############################################################
 # Cleanup
 ###############################################################


Index: mysql.spec
===================================================================
RCS file: /cvs/dist/rpms/mysql/devel/mysql.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- mysql.spec	3 Nov 2005 04:05:15 -0000	1.59
+++ mysql.spec	4 Nov 2005 00:13:28 -0000	1.60
@@ -13,6 +13,7 @@
 Patch3: mysql-libtool.patch
 Patch4: mysql-testing.patch
 Patch5: mysql-no-atomic.patch
+Patch6: mysql-rpl_ddl.patch
 URL: http://www.mysql.com
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Summary: MySQL client programs and shared libraries.
@@ -91,6 +92,7 @@
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 libtoolize --force
 aclocal
@@ -353,8 +355,8 @@
 %{_datadir}/sql-bench
 
 %changelog
-* Wed Nov  2 2005 Tom Lane <tgl at redhat.com> 5.0.15-1
-- Update to MySQL 5.0.15
+* Thu Nov  3 2005 Tom Lane <tgl at redhat.com> 5.0.15-1
+- Update to MySQL 5.0.15 (scratch build for now)
 
 * Wed Oct  5 2005 Tom Lane <tgl at redhat.com> 4.1.14-1
 - Update to MySQL 4.1.14