diff options
| author | periapt <periapt@bb5a2ed9-75f0-0310-a2b8-e46d7b0922c1> | 2012-05-26 16:16:19 +0000 |
|---|---|---|
| committer | periapt <periapt@bb5a2ed9-75f0-0310-a2b8-e46d7b0922c1> | 2012-05-26 16:16:19 +0000 |
| commit | 93e4639499371e6234d5e1173147cb013e5c2f38 (patch) | |
| tree | d9d778318ed3ddf613fe9d3cec002845c7e566da /debian/patches/regex_plus.patch | |
| parent | b9bac945f517fecf751eb7a279bd8910fb500083 (diff) | |
| download | mysql-5.5-93e4639499371e6234d5e1173147cb013e5c2f38.tar.gz | |
* Fixing regular expression in tests to guard against build path containing
the '+' symbol (Closes: #674210)
* Disabled certain SSL tests pending investigation (cf. #674267)
* Updated French translation (Closes: #674025)
* Updated Dutch translation (Closes: #674124)
* Updated Russian translation (Closes: #674189)
* Revert having libssl-dev as a build dependency and changed
WITH_SSL option to 'bundled' from 'yes' (Closes: #590905)
and (Closes: #673865)
* Removed main_openssl_1 patch
* Set SYSTEM_TYPE according to GNU Build System
git-svn-id: svn://svn.debian.org/svn/pkg-mysql/mysql-5.5/branches/unstable@2124 bb5a2ed9-75f0-0310-a2b8-e46d7b0922c1
Diffstat (limited to 'debian/patches/regex_plus.patch')
| -rw-r--r-- | debian/patches/regex_plus.patch | 30 |
1 files changed, 30 insertions, 0 deletions
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 |