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

[Norbert Tretkowski]

Author: nobse
Date: 2009-11-19 10:51:32 +0000 (Thu, 19 Nov 2009)
New Revision: 1772

Removed:
   mysql-dfsg-5.1/branches/unstable/debian/patches/60_zlib_innodb_workaround.dpatch
Modified:
   mysql-dfsg-5.1/branches/unstable/debian/changelog
   mysql-dfsg-5.1/branches/unstable/debian/patches/00list
Log:
Drop patch 60_zlib_innodb_workaround.dpatch

Modified: mysql-dfsg-5.1/branches/unstable/debian/changelog
===================================================================
--- mysql-dfsg-5.1/branches/unstable/debian/changelog	2009-11-19 08:48:03 UTC (rev 1771)
+++ mysql-dfsg-5.1/branches/unstable/debian/changelog	2009-11-19 10:51:32 UTC (rev 1772)
@@ -1,6 +1,7 @@
 mysql-dfsg-5.1 (5.1.41-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Drop patch 60_zlib_innodb_workaround.dpatch, merged upstream.
 
  -- Norbert Tretkowski <nobse at debian.org>  Thu, 19 Nov 2009 09:47:32 +0100
 

Modified: mysql-dfsg-5.1/branches/unstable/debian/patches/00list
===================================================================
--- mysql-dfsg-5.1/branches/unstable/debian/patches/00list	2009-11-19 08:48:03 UTC (rev 1771)
+++ mysql-dfsg-5.1/branches/unstable/debian/patches/00list	2009-11-19 10:51:32 UTC (rev 1772)
@@ -6,4 +6,3 @@
 41_scripts__mysql_install_db.sh__no_test.dpatch
 44_scripts__mysql_config__libs.dpatch
 50_mysql-test__db_test.dpatch
-60_zlib_innodb_workaround.dpatch

Deleted: 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	2009-11-19 08:48:03 UTC (rev 1771)
+++ mysql-dfsg-5.1/branches/unstable/debian/patches/60_zlib_innodb_workaround.dpatch	2009-11-19 10:51:32 UTC (rev 1772)
@@ -1,31 +0,0 @@
-#! /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/r/innodb-zip.result mysql-dfsg-5.1-5.1.39/mysql-test/suite/innodb/r/innodb-zip.result
---- mysql-dfsg-5.1-5.1.39.orig/mysql-test/suite/innodb/r/innodb-zip.result      2009-09-04 19:04:38.000000000 +0200
-+++ mysql-dfsg-5.1-5.1.39/mysql-test/suite/innodb/r/innodb-zip.result   2009-09-28 16:01:33.000000000 +0200
-@@ -141,7 +141,7 @@
- CREATE TABLE t1(c TEXT, PRIMARY KEY (c(440)))
- ENGINE=InnoDB ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=1 CHARSET=ASCII;
- ERROR 42000: Row size too large. The maximum row size for the used table type, not counting BLOBs, is 8126. You have to change some columns to TEXT or BLOBs
--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;
-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 16:01:22.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;