[Pkg-mysql-commits] r2132 - mysql-5.5/branches/unstable/debian/patches

[Nicholas Bamber]

Author: periapt
Date: 2012-06-02 09:10:41 +0000 (Sat, 02 Jun 2012)
New Revision: 2132

Modified:
   mysql-5.5/branches/unstable/debian/patches/mysqlcheck_tests.patch
Log:
skipped some more tests if local environment could cause issues

Modified: mysql-5.5/branches/unstable/debian/patches/mysqlcheck_tests.patch
===================================================================
--- mysql-5.5/branches/unstable/debian/patches/mysqlcheck_tests.patch	2012-06-02 08:43:48 UTC (rev 2131)
+++ mysql-5.5/branches/unstable/debian/patches/mysqlcheck_tests.patch	2012-06-02 09:10:41 UTC (rev 2132)
@@ -1,6 +1,6 @@
 Author: Nicholas Bamber <nicholas at 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 @@
  --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