diff options
author | periapt <periapt@bb5a2ed9-75f0-0310-a2b8-e46d7b0922c1> | 2012-06-02 09:10:41 +0000 |
---|---|---|
committer | periapt <periapt@bb5a2ed9-75f0-0310-a2b8-e46d7b0922c1> | 2012-06-02 09:10:41 +0000 |
commit | cf9bf67e31e8d56b689b87e782ff50384dd927e9 (patch) | |
tree | 4d5014213f1371925b6784273a2b2b8414173ae5 | |
parent | c4b7867582cd653d876a58141fa25b90de1b2aab (diff) | |
download | mysql-5.5-cf9bf67e31e8d56b689b87e782ff50384dd927e9.tar.gz |
skipped some more tests if local environment could cause issues
git-svn-id: svn://svn.debian.org/svn/pkg-mysql/mysql-5.5/branches/unstable@2132 bb5a2ed9-75f0-0310-a2b8-e46d7b0922c1
-rw-r--r-- | debian/patches/mysqlcheck_tests.patch | 26 |
1 files changed, 25 insertions, 1 deletions
diff --git a/debian/patches/mysqlcheck_tests.patch b/debian/patches/mysqlcheck_tests.patch index 18bdbfd..e0b5f28 100644 --- a/debian/patches/mysqlcheck_tests.patch +++ b/debian/patches/mysqlcheck_tests.patch @@ -1,6 +1,6 @@ Author: Nicholas Bamber <nicholas@periapt.co.uk> Bug: http://bugs.mysql.com/bug.php?id=65288 -Date: 2012-05-28 +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 @@ -95,3 +95,27 @@ Subject: child process picking up external config files --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 |