Merge lp:~percona-dev/percona-server/5.5.11-fix-bug-764152 into lp:~percona-dev/percona-server/5.5.11
Status: | Merged |
---|---|
Merge reported by: | Alexey Kopytov |
Merged at revision: | not available |
Proposed branch: | lp:~percona-dev/percona-server/5.5.11-fix-bug-764152 |
Merge into: | lp:~percona-dev/percona-server/5.5.11 |
Diff against target: |
58 lines (+17/-6) 2 files modified
mysql-test.diff (+16/-5) series (+1/-1) |
To merge this branch: | bzr merge lp:~percona-dev/percona-server/5.5.11-fix-bug-764152 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Percona developers | Pending | ||
Valentine Gostev | Pending | ||
Review via email: mp+58673@code.launchpad.net |
Description of the change
The mysql-test-run.pl script introduce variable "MYSQL_LIBDIR" as "$basedir/lib"
Sometime we install libs to "/usr/lib64"
For this trouble fix our patch mysql-test.diff change string:
--replace_result $MYSQL_LIBDIR MYSQL_LIBDIR /mysql/ /
to
--replace_result $MYSQL_LIBDIR MYSQL_LIBDIR MYSQL_LIBDIR64 MYSQL_LIBDIR /mysql/ /
But this is not work. First sibstuation "$MYSQL_LIBDIR MYSQL_LIBDIR" replaces "/usr/lib64/..." to "MYSQL_
In other word, "--replace_result" sibstuates string independ each from other.
I add variable "$MYSQL_LIBDIR64" and this work fine.