[Pkg-mysql-commits] r1844 - in mysql-dfsg-5.1/branches/unstable/debian: . patches

[Norbert Tretkowski]

Author: nobse
Date: 2010-02-21 19:47:16 +0000 (Sun, 21 Feb 2010)
New Revision: 1844

Added:
   mysql-dfsg-5.1/branches/unstable/debian/patches/20_disabled_tests.dpatch
Modified:
   mysql-dfsg-5.1/branches/unstable/debian/changelog
   mysql-dfsg-5.1/branches/unstable/debian/patches/00list
Log:
Disable innodb.innodb_information_schema test.

Modified: mysql-dfsg-5.1/branches/unstable/debian/changelog
===================================================================
--- mysql-dfsg-5.1/branches/unstable/debian/changelog	2010-02-18 20:48:38 UTC (rev 1843)
+++ mysql-dfsg-5.1/branches/unstable/debian/changelog	2010-02-21 19:47:16 UTC (rev 1844)
@@ -1,3 +1,10 @@
+mysql-dfsg-5.1 (5.1.44-2) unstable; urgency=low
+
+  * Disable innodb.innodb_information_schema test in testsuite run, it fails
+    randomly on at least i386.
+
+ -- Norbert Tretkowski <norbert at tretkowski.de>  Sun, 21 Feb 2010 20:45:59 +0100
+
 mysql-dfsg-5.1 (5.1.44-1) unstable; urgency=low
 
   * New upstream release.

Modified: mysql-dfsg-5.1/branches/unstable/debian/patches/00list
===================================================================
--- mysql-dfsg-5.1/branches/unstable/debian/patches/00list	2010-02-18 20:48:38 UTC (rev 1843)
+++ mysql-dfsg-5.1/branches/unstable/debian/patches/00list	2010-02-21 19:47:16 UTC (rev 1844)
@@ -2,6 +2,7 @@
 01_MAKEFILES__Docs_Makefile.in.dpatch
 02_no_builtin_ndbcluster_plugin.dpatch
 10_readline_build_fix.dpatch
+20_disabled_tests.dpatch
 33_scripts__mysql_create_system_tables__no_test.dpatch
 38_scripts__mysqld_safe.sh__signals.dpatch
 41_scripts__mysql_install_db.sh__no_test.dpatch

Added: mysql-dfsg-5.1/branches/unstable/debian/patches/20_disabled_tests.dpatch
===================================================================
--- mysql-dfsg-5.1/branches/unstable/debian/patches/20_disabled_tests.dpatch	                        (rev 0)
+++ mysql-dfsg-5.1/branches/unstable/debian/patches/20_disabled_tests.dpatch	2010-02-21 19:47:16 UTC (rev 1844)
@@ -0,0 +1,13 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 20_disabled_tests.dpatch by Norbert Tretkowski <norbert at tretkowski.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: As we completely disabled ndbcluster
+
+ at DPATCH@
+diff -Nur mysql-dfsg-5.1-5.1.44.orig/mysql-test/suite/innodb/t/disabled.def mysql-dfsg-5.1-5.1.44/mysql-test/suite/innodb/t/disabled.def
+--- mysql-dfsg-5.1-5.1.44.orig/mysql-test/suite/innodb/t/disabled.def	2010-02-04 13:09:18.000000000 +0100
++++ mysql-dfsg-5.1-5.1.44/mysql-test/suite/innodb/t/disabled.def	2010-02-21 20:44:22.857703756 +0100
+@@ -1 +1,2 @@
+ innodb-index: InnoDB: Error: table `test`.`t1#1` already exists in InnoDB internal
++innodb_information_schema: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=570693