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
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
|
Author: Nicholas Bamber <nicholas@periapt.co.uk>
Bug: http://bugs.mysql.com/bug.php?id=65288
Date: 2012-06-02
Subject: child process picking up external config files
The effect of the patch should be that the affected tests
run inside a clean chroot, but are skipped where stray
config files may upset the tests. These failed tests
are usually indicated by mysqlcheck triggering a FATAL ERROR.
--- /dev/null
+++ b/mysql-test/include/debian-fail-local_my_cnf.inc
@@ -0,0 +1,5 @@
+if ($FOUND_LOCAL_MY_CNF)
+{
+ skip See Oracle Bug#65288 (Debian);
+}
+
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -2462,6 +2462,17 @@
}
# ----------------------------------------------------
+ # found_local_my_cnf
+ # ----------------------------------------------------
+ my $found_local_my_cnf =
+ mtr_file_exists("~/.my.cnf") ||
+ mtr_file_exists("/etc/my.cnf") ||
+ mtr_file_exists("/etc/mysql/my.cnf");
+ if ($found_local_my_cnf) {
+ $ENV{'FOUND_LOCAL_MY_CNF'} = $found_local_my_cnf;
+ }
+
+ # ----------------------------------------------------
# perror
# ----------------------------------------------------
my $exe_perror= mtr_exe_exists(vs_config_dirs('extra', 'perror'),
--- a/mysql-test/t/mysqladmin.test
+++ b/mysql-test/t/mysqladmin.test
@@ -1,4 +1,5 @@
# Embedded server doesn't support external clients
+--source include/debian-fail-local_my_cnf.inc
--source include/not_embedded.inc
#
# Test "mysqladmin ping"
--- a/mysql-test/t/log_tables_upgrade.test
+++ b/mysql-test/t/log_tables_upgrade.test
@@ -1,3 +1,5 @@
+
+-- source include/debian-fail-local_my_cnf.inc
--source include/not_embedded.inc
--source include/have_csv.inc
--- a/mysql-test/t/mysql_upgrade.test
+++ b/mysql-test/t/mysql_upgrade.test
@@ -1,3 +1,5 @@
+
+-- source include/debian-fail-local_my_cnf.inc
-- source include/mysql_upgrade_preparation.inc
#
--- a/mysql-test/t/mysql_upgrade_ssl.test
+++ b/mysql-test/t/mysql_upgrade_ssl.test
@@ -1,5 +1,6 @@
# mysql_upgrade tests requiring SSL support
+-- source include/debian-fail-local_my_cnf.inc
-- source include/have_ssl_communication.inc
-- source include/mysql_upgrade_preparation.inc
--- a/mysql-test/t/plugin_auth.test
+++ b/mysql-test/t/plugin_auth.test
@@ -1,3 +1,5 @@
+
+-- source include/debian-fail-local_my_cnf.inc
--source include/have_plugin_auth.inc
--source include/not_embedded.inc
--source include/mysql_upgrade_preparation.inc
--- a/mysql-test/suite/perfschema/t/pfs_upgrade.test
+++ b/mysql-test/suite/perfschema/t/pfs_upgrade.test
@@ -3,6 +3,7 @@
# database.
#
+-- source include/debian-fail-local_my_cnf.inc
--source include/not_embedded.inc
--source include/have_perfschema.inc
--source include/have_lowercase0.inc
--- a/mysql-test/suite/rpl/t/rpl_mysql_upgrade.test
+++ b/mysql-test/suite/rpl/t/rpl_mysql_upgrade.test
@@ -5,6 +5,7 @@
# options are added into mysql_upgrade. These options control whether sql
# statements are binlogged or not.
#############################################################################
+-- source include/debian-fail-local_my_cnf.inc
--source include/master-slave.inc
# Only run test if "mysql_upgrade" is found
--- a/mysql-test/t/myisam.test
+++ b/mysql-test/t/myisam.test
@@ -1,3 +1,5 @@
+
+-- source include/debian-fail-local_my_cnf.inc
#
# Test bugs in the MyISAM code
#
--- a/mysql-test/t/myisampack.test
+++ b/mysql-test/t/myisampack.test
@@ -1,3 +1,5 @@
+
+-- source include/debian-fail-local_my_cnf.inc
-- disable_warnings
DROP TABLE IF EXISTS t1,t2,t3;
-- enable_warnings
--- a/mysql-test/t/mysqldump.test
+++ b/mysql-test/t/mysqldump.test
@@ -1,4 +1,5 @@
# Embedded server doesn't support external clients
+-- source include/debian-fail-local_my_cnf.inc
--source include/not_embedded.inc
# Binlog is required
|
