[Pkg-mysql-commits] r2006 - mysql-5.5/branches/experimental/debian/patches

[Norbert Tretkowski]

Author: nobse
Date: 2011-08-12 18:42:16 +0000 (Fri, 12 Aug 2011)
New Revision: 2006

Added:
   mysql-5.5/branches/experimental/debian/patches/62_disable_tests.patch
Removed:
   mysql-5.5/branches/experimental/debian/patches/62_disable_longfilename_test.patch
Modified:
   mysql-5.5/branches/experimental/debian/patches/series
Log:
Update patch.

Deleted: mysql-5.5/branches/experimental/debian/patches/62_disable_longfilename_test.patch
===================================================================
--- mysql-5.5/branches/experimental/debian/patches/62_disable_longfilename_test.patch	2011-08-01 11:06:47 UTC (rev 2005)
+++ mysql-5.5/branches/experimental/debian/patches/62_disable_longfilename_test.patch	2011-08-12 18:42:16 UTC (rev 2006)
@@ -1,13 +0,0 @@
-Description: disable the partition_rename_longfilename test as it fails
- when building with sbuild and schroots.
-Author: Marc Deslauriers <marc.deslauriers at canonical.com>
-
-Index: mysql-5.5-sid/mysql-test/t/disabled.def
-===================================================================
---- mysql-5.5-sid.orig/mysql-test/t/disabled.def	2011-06-03 00:18:11.000000000 -0700
-+++ mysql-5.5-sid/mysql-test/t/disabled.def	2011-06-03 00:52:58.756181167 -0700
-@@ -17,3 +17,4 @@
- alter_table-big          : Bug#37248 2010-11-15 mattiasj was not tested
- create-big               : Bug#37248 2010-11-15 mattiasj was not tested
- archive-big              : Bug#11817185 2011-03-10 Anitha Disabled since this leads to timeout on Solaris Sparc
-+partition_rename_longfilename : Fails when building with sbuild and schroots

Added: mysql-5.5/branches/experimental/debian/patches/62_disable_tests.patch
===================================================================
--- mysql-5.5/branches/experimental/debian/patches/62_disable_tests.patch	                        (rev 0)
+++ mysql-5.5/branches/experimental/debian/patches/62_disable_tests.patch	2011-08-12 18:42:16 UTC (rev 2006)
@@ -0,0 +1,9 @@
+diff -Nur mysql-5.5-5.5.15.orig/mysql-test/t/disabled.def mysql-5.5-5.5.15/mysql-test/t/disabled.def
+--- mysql-5.5-5.5.15.orig/mysql-test/t/disabled.def	2011-07-13 21:09:03.000000000 +0200
++++ mysql-5.5-5.5.15/mysql-test/t/disabled.def	2011-08-08 11:37:31.634672359 +0200
+@@ -16,3 +16,5 @@
+ create-big               : Bug#11748731 2010-11-15 mattiasj was not tested
+ archive-big              : Bug#11817185 2011-03-10 Anitha Disabled since this leads to timeout on Solaris Sparc
+ log_tables-big           : Bug#11756699 2010-11-15 mattiasj report already exists
++partition_rename_longfilename : Fails when building with sbuild and schroots
++file_contents            : Fails without bzr revision id

Modified: mysql-5.5/branches/experimental/debian/patches/series
===================================================================
--- mysql-5.5/branches/experimental/debian/patches/series	2011-08-01 11:06:47 UTC (rev 2005)
+++ mysql-5.5/branches/experimental/debian/patches/series	2011-08-12 18:42:16 UTC (rev 2006)
@@ -1,2 +1,2 @@
-62_disable_longfilename_test.patch
 38_scripts__mysqld_safe.sh__signals.patch
+62_disable_tests.patch