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

[Nicholas Bamber]

tags 674210 pending
thanks

Author: periapt
Date: 2012-05-24 20:36:06 +0000 (Thu, 24 May 2012)
New Revision: 2120

Added:
   mysql-5.5/branches/wheezy/debian/patches/linked_list_mem_failure.patch
   mysql-5.5/branches/wheezy/debian/patches/regex_plus.patch
Modified:
   mysql-5.5/branches/wheezy/debian/changelog
   mysql-5.5/branches/wheezy/debian/patches/series
Log:
* Fixing regular expression in tests to guard against build path containing
  the '+' symbol (Closes: #674210)
* Disabled certain SSL tests pending investigation (cf. #674267)

Modified: mysql-5.5/branches/wheezy/debian/changelog
===================================================================
--- mysql-5.5/branches/wheezy/debian/changelog	2012-05-23 05:13:56 UTC (rev 2119)
+++ mysql-5.5/branches/wheezy/debian/changelog	2012-05-24 20:36:06 UTC (rev 2120)
@@ -1,3 +1,11 @@
+mysql-5.5 (5.5.23+dfsg-2) UNRELEASED; urgency=low
+
+  * Fixing regular expression in tests to guard against build path containing
+    the '+' symbol (Closes: #674210)
+  * Disabled certain SSL tests pending investigation (cf. #674267)
+
+ -- Nicholas Bamber <nicholas at periapt.co.uk>  Wed, 23 May 2012 18:30:53 +0100
+
 mysql-5.5 (5.5.23+dfsg-1) unstable; urgency=low
 
   * Revert having libssl-dev as a build dependency and changed

Added: mysql-5.5/branches/wheezy/debian/patches/linked_list_mem_failure.patch
===================================================================
--- mysql-5.5/branches/wheezy/debian/patches/linked_list_mem_failure.patch	                        (rev 0)
+++ mysql-5.5/branches/wheezy/debian/patches/linked_list_mem_failure.patch	2012-05-24 20:36:06 UTC (rev 2120)
@@ -0,0 +1,17 @@
+--- 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

Added: mysql-5.5/branches/wheezy/debian/patches/regex_plus.patch
===================================================================
--- mysql-5.5/branches/wheezy/debian/patches/regex_plus.patch	                        (rev 0)
+++ mysql-5.5/branches/wheezy/debian/patches/regex_plus.patch	2012-05-24 20:36:06 UTC (rev 2120)
@@ -0,0 +1,30 @@
+Author: Nicholas Bamber <nicholas at periapt.co.uk>
+Subject: FTBS when in build directory containing '+'
+Bug-Debian: http://bugs.debian.org/674210
+Bug: http://bugs.mysql.com/bug.php?id=65408
+Last-Update: 2012-05-24
+--- a/mysql-test/include/mysqld--help.inc
++++ b/mysql-test/include/mysqld--help.inc
+@@ -47,7 +47,11 @@
+     s/\b4294967295\b/18446744073709551615/;
+     s/\b2146435072\b/9223372036853727232/;
+     s/\b196608\b/262144/;
+-    foreach $var (@env) { s/$ENV{$var}/$var/ }
++    foreach $var (@env) {
++	my $re = $ENV{$var};
++	$re =~ s/\+/\\\+/g;
++	s/$re/$var/
++    }
+     next if /use --skip-(use-)?symbolic-links to disable/; # for valgrind, again
+     next if $skip;
+     print;
+--- a/mysql-test/suite/sys_vars/t/character_sets_dir_basic.test
++++ b/mysql-test/suite/sys_vars/t/character_sets_dir_basic.test
+@@ -7,6 +7,7 @@
+ # TODO: fix with a proper comparison in mysqltest
+ let $rcd= `SELECT REPLACE('$MYSQL_CHARSETSDIR', '\\\\\', '.')`;
+ let $rcd= `SELECT REPLACE('$rcd', '/', '.')`;
++let $rcd= `SELECT REPLACE('$rcd', '+', '.')`;
+ let $regex_charsetdir= `SELECT '/$rcd[\\\\\/\\\\\]/MYSQL_CHARSETSDIR/'`;
+ 
+ --replace_regex $regex_charsetdir

Modified: mysql-5.5/branches/wheezy/debian/patches/series
===================================================================
--- mysql-5.5/branches/wheezy/debian/patches/series	2012-05-23 05:13:56 UTC (rev 2119)
+++ mysql-5.5/branches/wheezy/debian/patches/series	2012-05-24 20:36:06 UTC (rev 2120)
@@ -8,3 +8,5 @@
 73_mysqlcheck_tests.patch
 93_kfreebsd_tests.patch
 94_spelling.patch
+regex_plus.patch
+linked_list_mem_failure.patch