diff options
| author | spamaps-guest <spamaps-guest@bb5a2ed9-75f0-0310-a2b8-e46d7b0922c1> | 2013-01-09 22:32:05 +0000 |
|---|---|---|
| committer | spamaps-guest <spamaps-guest@bb5a2ed9-75f0-0310-a2b8-e46d7b0922c1> | 2013-01-09 22:32:05 +0000 |
| commit | 7e82d600d240c23350d073eaf69203221f2edbf8 (patch) | |
| tree | fa7afacc013f1cb744f58cde3ce4eae7b3c5df55 /debian/patches/regex_plus.patch | |
| parent | 3e1616c235a6aff933ab597042819a2b1cac4a84 (diff) | |
| download | mysql-5.5-7e82d600d240c23350d073eaf69203221f2edbf8.tar.gz | |
New upstream release. (Closes: #695001) Refreshed patches.
git-svn-id: svn://svn.debian.org/svn/pkg-mysql/mysql-5.5/branches/unstable@2206 bb5a2ed9-75f0-0310-a2b8-e46d7b0922c1
Diffstat (limited to 'debian/patches/regex_plus.patch')
| -rw-r--r-- | debian/patches/regex_plus.patch | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/debian/patches/regex_plus.patch b/debian/patches/regex_plus.patch index 5094e46..fe5c3d0 100644 --- a/debian/patches/regex_plus.patch +++ b/debian/patches/regex_plus.patch @@ -3,8 +3,10 @@ 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 +Index: mysql-5.5.29/mysql-test/include/mysqld--help.inc +=================================================================== +--- mysql-5.5.29.orig/mysql-test/include/mysqld--help.inc 2013-01-02 15:36:15.078372518 -0800 ++++ mysql-5.5.29/mysql-test/include/mysqld--help.inc 2013-01-02 15:38:16.403258546 -0800 @@ -47,7 +47,11 @@ s/\b4294967295\b/18446744073709551615/; s/\b2146435072\b/9223372036853727232/; @@ -18,8 +20,10 @@ Last-Update: 2012-05-24 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 +Index: mysql-5.5.29/mysql-test/suite/sys_vars/t/character_sets_dir_basic.test +=================================================================== +--- mysql-5.5.29.orig/mysql-test/suite/sys_vars/t/character_sets_dir_basic.test 2013-01-02 15:36:15.078372518 -0800 ++++ mysql-5.5.29/mysql-test/suite/sys_vars/t/character_sets_dir_basic.test 2013-01-02 15:38:16.403258546 -0800 @@ -7,6 +7,7 @@ # TODO: fix with a proper comparison in mysqltest let $rcd= `SELECT REPLACE('$MYSQL_CHARSETSDIR', '\\\\\', '.')`; |