From 97abdcf441b5c3dbb7334575a8cdb6e9bbd0a49f Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@fedoraproject.org>
Date: Fri, 4 Nov 2005 00:13:28 +0000
Subject: [PATCH] Work around a regression test problem.

---
 mysql-rpl_ddl.patch | 25 +++++++++++++++++++++++++
 mysql.spec          |  6 ++++--
 2 files changed, 29 insertions(+), 2 deletions(-)
 create mode 100644 mysql-rpl_ddl.patch

diff --git a/mysql-rpl_ddl.patch b/mysql-rpl_ddl.patch
new file mode 100644
index 0000000..b760c0e
--- /dev/null
+++ b/mysql-rpl_ddl.patch
@@ -0,0 +1,25 @@
+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
+ ###############################################################
diff --git a/mysql.spec b/mysql.spec
index 7d1e63c..ee61269 100644
--- a/mysql.spec
+++ b/mysql.spec
@@ -13,6 +13,7 @@ Patch2: mysql-errno.patch
 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 @@ MySQL.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 libtoolize --force
 aclocal
@@ -353,8 +355,8 @@ fi
 %{_datadir}/sql-bench
 
 %changelog
-* Wed Nov  2 2005 Tom Lane <tgl@redhat.com> 5.0.15-1
-- Update to MySQL 5.0.15
+* Thu Nov  3 2005 Tom Lane <tgl@redhat.com> 5.0.15-1
+- Update to MySQL 5.0.15 (scratch build for now)
 
 * Wed Oct  5 2005 Tom Lane <tgl@redhat.com> 4.1.14-1
 - Update to MySQL 4.1.14