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

[Norbert Tretkowski]

Author: nobse
Date: 2009-09-28 13:38:42 +0000 (Mon, 28 Sep 2009)
New Revision: 1763

Added:
   mysql-dfsg-5.1/branches/unstable/debian/patches/60_zlib_innodb_workaround.dpatch
Modified:
   mysql-dfsg-5.1/branches/unstable/debian/changelog
Log:
New patch 60_zlib_innodb_workaround.dpatch to fix an incompatibility between zlib and innodb during testsuite run.

Modified: mysql-dfsg-5.1/branches/unstable/debian/changelog
===================================================================
--- mysql-dfsg-5.1/branches/unstable/debian/changelog	2009-09-23 20:02:55 UTC (rev 1762)
+++ mysql-dfsg-5.1/branches/unstable/debian/changelog	2009-09-28 13:38:42 UTC (rev 1763)
@@ -1,6 +1,8 @@
 mysql-dfsg-5.1 (5.1.39-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * New patch 60_zlib_innodb_workaround.dpatch to fix an incompatibility
+    between zlib and innodb during testsuite run.
   * Wait in the SIGHUP trap to avoid killing an existing mysqld process when a
     HUP signal is sent to mysqld_safe, patch based based on Mathias Gug's fix
     from 5.0 series. (closes: #545044)
@@ -13,7 +15,7 @@
     Mathias Gug. (closes: #545760)
   * Switch build-dependency from libreadline5-dev to libreadline-dev.
 
- -- Norbert Tretkowski <nobse at debian.org>  Mon, 21 Sep 2009 12:31:37 +0200
+ -- Norbert Tretkowski <nobse at debian.org>  Mon, 28 Sep 2009 15:36:26 +0200
 
 mysql-dfsg-5.1 (5.1.37-2) unstable; urgency=low
 

Added: mysql-dfsg-5.1/branches/unstable/debian/patches/60_zlib_innodb_workaround.dpatch
===================================================================
--- mysql-dfsg-5.1/branches/unstable/debian/patches/60_zlib_innodb_workaround.dpatch	                        (rev 0)
+++ mysql-dfsg-5.1/branches/unstable/debian/patches/60_zlib_innodb_workaround.dpatch	2009-09-28 13:38:42 UTC (rev 1763)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 60_zlib_innodb_workaround.dpatch by Norbert Tretkowski <nobse at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: http://bugs.mysql.com/bug.php?id=47495
+
+ at DPATCH@
+diff -Nur mysql-dfsg-5.1-5.1.39.orig/mysql-test/suite/innodb/t/innodb-zip.test mysql-dfsg-5.1-5.1.39/mysql-test/suite/innodb/t/innodb-zip.test
+--- mysql-dfsg-5.1-5.1.39.orig/mysql-test/suite/innodb/t/innodb-zip.test	2009-09-04 19:04:37.000000000 +0200
++++ mysql-dfsg-5.1-5.1.39/mysql-test/suite/innodb/t/innodb-zip.test	2009-09-28 15:34:41.000000000 +0200
+@@ -106,7 +106,7 @@
+ --error ER_TOO_BIG_ROWSIZE
+ CREATE TABLE t1(c TEXT, PRIMARY KEY (c(440)))
+ ENGINE=InnoDB ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=1 CHARSET=ASCII;
+-CREATE TABLE t1(c TEXT, PRIMARY KEY (c(439)))
++CREATE TABLE t1(c TEXT, PRIMARY KEY (c(438)))
+ ENGINE=InnoDB ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=1 CHARSET=ASCII;
+ INSERT INTO t1 VALUES(REPEAT('A',512)),(REPEAT('B',512));
+ DROP TABLE t1;