rpms/mysql8.4
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Work around a regression test problem.

Browse Source
This commit is contained in:
Tom Lane 2005-11-04 00:13:28 +00:00 committed by Michal Schorm
parent 850b2a0e7e
commit 97abdcf441
2 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
mysql-rpl_ddl.patch Normal file
View File

@ -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
###############################################################

6
mysql.spec
View File

@ -13,6 +13,7 @@ Patch2: mysql-errno.patch
Patch3: mysql-libtool.patch Patch3: mysql-libtool.patch
Patch4: mysql-testing.patch Patch4: mysql-testing.patch
Patch5: mysql-no-atomic.patch Patch5: mysql-no-atomic.patch
Patch6: mysql-rpl_ddl.patch
URL: http://www.mysql.com URL: http://www.mysql.com
BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRoot: %{_tmppath}/%{name}-%{version}-root
Summary: MySQL client programs and shared libraries. Summary: MySQL client programs and shared libraries.
@ -91,6 +92,7 @@ MySQL.
%patch3 -p1 %patch3 -p1
%patch4 -p1 %patch4 -p1
%patch5 -p1 %patch5 -p1
%patch6 -p1
libtoolize --force libtoolize --force
aclocal aclocal
@ -353,8 +355,8 @@ fi
%{_datadir}/sql-bench %{_datadir}/sql-bench
%changelog %changelog
* Wed Nov 2 2005 Tom Lane <tgl@redhat.com> 5.0.15-1 * Thu Nov 3 2005 Tom Lane <tgl@redhat.com> 5.0.15-1
- Update to MySQL 5.0.15 - Update to MySQL 5.0.15 (scratch build for now)
* Wed Oct 5 2005 Tom Lane <tgl@redhat.com> 4.1.14-1 * Wed Oct 5 2005 Tom Lane <tgl@redhat.com> 4.1.14-1
- Update to MySQL 4.1.14 - Update to MySQL 4.1.14