diff options
Diffstat (limited to 'debian/patches')
| -rw-r--r-- | debian/patches/linked_list_mem_failure.patch | 22 | ||||
| -rw-r--r-- | debian/patches/main_openssl_1.patch | 22 | ||||
| -rw-r--r-- | debian/patches/regex_plus.patch | 30 | ||||
| -rw-r--r-- | debian/patches/series | 3 |
4 files changed, 54 insertions, 23 deletions
diff --git a/debian/patches/linked_list_mem_failure.patch b/debian/patches/linked_list_mem_failure.patch new file mode 100644 index 0000000..c3346bb --- /dev/null +++ b/debian/patches/linked_list_mem_failure.patch @@ -0,0 +1,22 @@ +Author: Nicholas Bamber <nicholas@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 diff --git a/debian/patches/main_openssl_1.patch b/debian/patches/main_openssl_1.patch deleted file mode 100644 index 1be90b1..0000000 --- a/debian/patches/main_openssl_1.patch +++ /dev/null @@ -1,22 +0,0 @@ -Author: Nicholas Bamber <nicholas@periapt.co.uk> -Debian-Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=660799 -Forwarded: no -Last-Update: 2012-03-02 -Subject: This test fails in the presence of libssl-dev - and SSL functionality seems to fail without it. - ---- a/mysql-test/r/openssl_1.result -+++ b/mysql-test/r/openssl_1.result -@@ -44,9 +44,9 @@ - drop user ssl_user1@localhost, ssl_user2@localhost, - ssl_user3@localhost, ssl_user4@localhost, ssl_user5@localhost; - drop table t1; --mysqltest: Could not open connection 'default': 2026 SSL connection error: ASN: bad other signature confirmation --mysqltest: Could not open connection 'default': 2026 SSL connection error: ASN: bad other signature confirmation --mysqltest: Could not open connection 'default': 2026 SSL connection error: ASN: bad other signature confirmation -+mysqltest: Could not open connection 'default': 2026 SSL connection error: error:00000001:lib(0):func(0):reason(1) -+mysqltest: Could not open connection 'default': 2026 SSL connection error: error:00000001:lib(0):func(0):reason(1) -+mysqltest: Could not open connection 'default': 2026 SSL connection error: error:00000001:lib(0):func(0):reason(1) - SSL error: Unable to get private key from '' - mysqltest: Could not open connection 'default': 2026 SSL connection error: Unable to get private key - SSL error: Unable to get certificate from '' diff --git a/debian/patches/regex_plus.patch b/debian/patches/regex_plus.patch new file mode 100644 index 0000000..5094e46 --- /dev/null +++ b/debian/patches/regex_plus.patch @@ -0,0 +1,30 @@ +Author: Nicholas Bamber <nicholas@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 diff --git a/debian/patches/series b/debian/patches/series index 0526cf4..c11d471 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,4 @@ hurd.patch -main_openssl_1.patch scripts__mysqld_safe.sh__signals.patch disable_tests.patch mysql_va_list.patch @@ -10,3 +9,5 @@ kfreebsd_tests.patch spelling.patch fix-mysqldump-test.patch hyphens-in-manpages.patch +regex_plus.patch +linked_list_mem_failure.patch |