[Pkg-mysql-commits] r1283 - in trunk/debian: . patches

[Norbert Tretkowski]

Author: nobse
Date: 2008-07-01 07:32:58 +0000 (Tue, 01 Jul 2008)
New Revision: 1283

Added:
   trunk/debian/patches/58_disable-ndb-backup-print.dpatch
Modified:
   trunk/debian/changelog
   trunk/debian/patches/00list
   trunk/debian/rules
Log:
Add 58_disable-ndb-backup-print.dpatch.

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2008-06-28 12:31:07 UTC (rev 1282)
+++ trunk/debian/changelog	2008-07-01 07:32:58 UTC (rev 1283)
@@ -1,15 +1,18 @@
 mysql-dfsg-5.0 (5.0.51a-10) UNRELEASED; urgency=low
 
+  * New patch 58_disable-ndb-backup-print.dpatch to disable ndb_backup_print,
+    ndb_alter_table and ndb_replace tests. (closes: #474893)
+  * Reenable error handling in testsuite on i386.
   * Make lintian happy:
     + Fix build-dependency on -1 revision.
     + Fix deprecated chown usage.
     + Fix spelling error in description.
 
- -- Norbert Tretkowski <nobse at debian.org>  Sat, 28 Jun 2008 14:30:46 +0200
+ -- Norbert Tretkowski <nobse at debian.org>  Tue, 01 Jul 2008 09:26:12 +0200
 
 mysql-dfsg-5.0 (5.0.51a-9) unstable; urgency=low
 
-  * Ignore errors in testsuite on i386. (closes: #474893)
+  * Ignore errors in testsuite on i386. (workaround for #474893)
 
  -- Norbert Tretkowski <nobse at debian.org>  Wed, 25 Jun 2008 15:07:03 +0200
 
@@ -33,7 +36,7 @@
     - Finnish, from Esko Arajärvi. (closes: #486554)
     - Portuguese, from Miguel Figueiredo. (closes: #486709)
     - Romanian, from Eddy Petrișor. (closes: #486944)
-    - Japanese, Hideki Yamane. (closes: #487270)
+    - Japanese, from Hideki Yamane. (closes: #487270)
 
  -- Norbert Tretkowski <nobse at debian.org>  Sat, 21 Jun 2008 19:20:48 +0200
 

Modified: trunk/debian/patches/00list
===================================================================
--- trunk/debian/patches/00list	2008-06-28 12:31:07 UTC (rev 1282)
+++ trunk/debian/patches/00list	2008-07-01 07:32:58 UTC (rev 1283)
@@ -14,6 +14,7 @@
 55_testsuite-2008.dpatch
 56_fix_order_by.dpatch
 57_fix_mysql_replication.dpatch
+58_disable-ndb-backup-print.dpatch
 80_fix_user_setup_on_localhost.dpatch
 86_PATH_MAX.dpatch
 89_ndb__staticlib.dpatch

Added: trunk/debian/patches/58_disable-ndb-backup-print.dpatch
===================================================================
--- trunk/debian/patches/58_disable-ndb-backup-print.dpatch	                        (rev 0)
+++ trunk/debian/patches/58_disable-ndb-backup-print.dpatch	2008-07-01 07:32:58 UTC (rev 1283)
@@ -0,0 +1,17 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 58_disable-ndb-backup-print.dpatch by Norbert Tretkowski <nobse at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -Naur 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 10:23:06.000000000 -0500
++++ mysql-dfsg-5.0-5.0.51a/mysql-test/t/disabled.def	2008-06-05 09:49:46.000000000 -0400
+@@ -16,3 +16,6 @@
+ 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
++ndb_backup_print     : Bug#32357: ndb_backup_print test fails sometimes in pushbuild
++ndb_alter_table      : failed for some reason
++ndb_replace          : failed for some reason

Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules	2008-06-28 12:31:07 UTC (rev 1282)
+++ trunk/debian/rules	2008-07-01 07:32:58 UTC (rev 1283)
@@ -38,7 +38,7 @@
     USE_ASSEMBLER=--enable-assembler 
 endif
 
-ifneq ($(findstring $(ARCH), alpha arm armel hppa i386 mipsel powerpc sparc),)
+ifneq ($(findstring $(ARCH), alpha arm armel hppa mipsel powerpc sparc),)
    TESTSUITE_FAIL_CMD=true
 else
    TESTSUITE_FAIL_CMD=exit 1