summaryrefslogtreecommitdiff
blob: 4794710804f8ffa870be99daab266a6390b93035 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
Patch borrowed from CentOS 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
 ###############################################################
Patch borrowed from CentOS mysql-rpl-test.patch
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);