[Pkg-mysql-commits] r1387 - trunk/debian/patches

[Norbert Tretkowski]

Author: nobse
Date: 2008-12-31 09:23:41 +0000 (Wed, 31 Dec 2008)
New Revision: 1387

Modified:
   trunk/debian/patches/58_disable-testsuite-tests.dpatch
   trunk/debian/patches/60_fix_rpl_path_test.dpatch
   trunk/debian/patches/61_fix_leap_seconds.dpatch
Log:
Disable timezone3 test.

Modified: trunk/debian/patches/58_disable-testsuite-tests.dpatch
===================================================================
--- trunk/debian/patches/58_disable-testsuite-tests.dpatch	2008-12-30 17:41:35 UTC (rev 1386)
+++ trunk/debian/patches/58_disable-testsuite-tests.dpatch	2008-12-31 09:23:41 UTC (rev 1387)
@@ -7,8 +7,8 @@
 @DPATCH@
 diff -Nur mysql-dfsg-5.0-5.0.51a.orig/mysql-test/t/disabled.def mysql-dfsg-5.0-5.0.51a/mysql-test/t/disabled.def
 --- mysql-dfsg-5.0-5.0.51a.orig/mysql-test/t/disabled.def	2008-01-11 16:23:06.000000000 +0100
-+++ mysql-dfsg-5.0-5.0.51a/mysql-test/t/disabled.def	2008-10-07 12:43:42.000000000 +0200
-@@ -16,3 +16,8 @@
++++ mysql-dfsg-5.0-5.0.51a/mysql-test/t/disabled.def	2008-12-31 10:22:13.000000000 +0100
+@@ -16,3 +16,9 @@
  im_options_set       : Bug#20294: Instance manager tests fail randomly
  im_options_unset     : Bug#20294: Instance manager tests fail randomly
  im_utils             : Bug#20294: Instance manager tests fail randomly
@@ -17,3 +17,4 @@
 +ndb_replace          : failed for some reason
 +innodb_handler       : http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=491363
 +rpl_ndb_innodb_trans : http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=494238
++timezone3            : http://bugs.mysql.com/bug.php?id=39920

Modified: trunk/debian/patches/60_fix_rpl_path_test.dpatch
===================================================================
--- trunk/debian/patches/60_fix_rpl_path_test.dpatch	2008-12-30 17:41:35 UTC (rev 1386)
+++ trunk/debian/patches/60_fix_rpl_path_test.dpatch	2008-12-31 09:23:41 UTC (rev 1387)
@@ -3,6 +3,8 @@
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
 ## DP: http://bugs.mysql.com/30209
+
+ at DPATCH@
 diff -Nrup a/mysql-test/r/rpl_packet.result b/mysql-test/r/rpl_packet.result
 --- a/mysql-test/r/rpl_packet.result	2007-03-16 16:25:15 +02:00
 +++ b/mysql-test/r/rpl_packet.result	2007-08-29 19:57:07 +03:00

Modified: trunk/debian/patches/61_fix_leap_seconds.dpatch
===================================================================
--- trunk/debian/patches/61_fix_leap_seconds.dpatch	2008-12-30 17:41:35 UTC (rev 1386)
+++ trunk/debian/patches/61_fix_leap_seconds.dpatch	2008-12-31 09:23:41 UTC (rev 1387)
@@ -4,6 +4,7 @@
 ## All lines beginning with `## DP:' are a description of the patch.
 ## DP: http://bugs.mysql.com/39920
 
+ at DPATCH@
 diff -Nur mysql-dfsg-5.0-5.0.51a.orig/mysql-test/r/timezone2.result mysql-dfsg-5.0-5.0.51a/mysql-test/r/timezone2.result
 --- mysql-dfsg-5.0-5.0.51a.orig/mysql-test/r/timezone2.result	2008-01-11 16:23:41.000000000 +0100
 +++ mysql-dfsg-5.0-5.0.51a/mysql-test/r/timezone2.result	2008-12-30 18:40:34.000000000 +0100