[Pkg-mysql-commits] r2166 - in mysql-5.5/branches/wheezy/debian: . patches

[Nicholas Bamber]

tags 678252 pending
thanks

Author: periapt
Date: 2012-06-20 19:02:10 +0000 (Wed, 20 Jun 2012)
New Revision: 2166

Removed:
   mysql-5.5/branches/wheezy/debian/patches/linked_list_mem_failure.patch
Modified:
   mysql-5.5/branches/wheezy/debian/changelog
   mysql-5.5/branches/wheezy/debian/patches/series
Log:
Setting the gcc/g++ version to 4.4 on i386 platforms and removed
patch disabling tests (Closes: #674267) but see #678252 for follow
up from upstream

Modified: mysql-5.5/branches/wheezy/debian/changelog
===================================================================
--- mysql-5.5/branches/wheezy/debian/changelog	2012-06-20 18:52:05 UTC (rev 2165)
+++ mysql-5.5/branches/wheezy/debian/changelog	2012-06-20 19:02:10 UTC (rev 2166)
@@ -2,8 +2,9 @@
 
   * Made DFSG repacking mechanism independent of local installs, improved
     the documentation and added debian/README.source
-  * Setting the gcc/g++ version to 4.4 on i386 platforms (Closes: #674267)
-    but see #678252 for follow up from upstream
+  * Setting the gcc/g++ version to 4.4 on i386 platforms and removed
+    patch disabling tests (Closes: #674267) but see #678252 for follow
+    up from upstream
 
  -- Nicholas Bamber <nicholas at periapt.co.uk>  Sat, 16 Jun 2012 13:53:35 +0100
 

Deleted: mysql-5.5/branches/wheezy/debian/patches/linked_list_mem_failure.patch
===================================================================
--- mysql-5.5/branches/wheezy/debian/patches/linked_list_mem_failure.patch	2012-06-20 18:52:05 UTC (rev 2165)
+++ mysql-5.5/branches/wheezy/debian/patches/linked_list_mem_failure.patch	2012-06-20 19:02:10 UTC (rev 2166)
@@ -1,22 +0,0 @@
-Author: Nicholas Bamber <nicholas at periapt.co.uk>
-Subject: certain tests failing
-Bug-Debian: http://bugs.debian.org/674267
-Last-Update: 2012-05-25
-Forwarded: no
---- a/mysql-test/suite/rpl/t/disabled.def
-+++ b/mysql-test/suite/rpl/t/disabled.def
-@@ -17,3 +17,6 @@
- rpl_stm_until : BUG#59543 Jan 26 2011 alfranio Replication test from eits suite rpl_row_until times out
- rpl_heartbeat_basic : Fails intermittently on AMD64 buildds http://pad.lv/894146
- rpl_mysql_upgrade: Fails on Debian #64773
-+rpl_heartbeat_ssl:     Debian Bug 674267 2012-05-24
-+rpl_ssl1: Debian Bug 674267 2012-05-24
-+rpl_ssl: Debian Bug 674267 2012-05-24
---- a/mysql-test/t/disabled.def
-+++ b/mysql-test/t/disabled.def
-@@ -29,3 +29,5 @@
- ssl_compress             : Bug#64773 2012-03-27 Debian local
- ssl                      : Bug#64773 2012-03-27 Debian local
- openssl_1                : Bug#64773 2012-03-27 Debian local
-+ssl_cipher               : Debian Bug 674267 2012-05-24
-+ssl_connect              : Debian Bug 674267 2012-05-24

Modified: mysql-5.5/branches/wheezy/debian/patches/series
===================================================================
--- mysql-5.5/branches/wheezy/debian/patches/series	2012-06-20 18:52:05 UTC (rev 2165)
+++ mysql-5.5/branches/wheezy/debian/patches/series	2012-06-20 19:02:10 UTC (rev 2166)
@@ -9,5 +9,4 @@
 93_kfreebsd_tests.patch
 94_spelling.patch
 regex_plus.patch
-linked_list_mem_failure.patch
 versioned_symbols.patch