Merge lp:~percona-dev/percona-server/5.5.11-fix-bug-764152 into lp:~percona-dev/percona-server/5.5.11

Proposed by Oleg Tsarev on 2011-04-21
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
Reviewer Review Type Date Requested Status
Percona developers 2011-04-21 Pending
Valentine Gostev 2011-04-21 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_LIBDIR64/...", but second sibstiation "MYSQL_LIBDIR64 MYSQL_LIBDIR" doesn't applies to result string.
In other word, "--replace_result" sibstuates string independ each from other.
I add variable "$MYSQL_LIBDIR64" and this work fine.

To post a comment you must log in.
112. By Oleg Tsarev on 2011-04-21

remove excess patch

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'mysql-test.diff'
2--- mysql-test.diff 2011-04-09 15:20:23 +0000
3+++ mysql-test.diff 2011-04-21 16:12:26 +0000
4@@ -1276,6 +1276,17 @@
5 +++ b/mysql-test/suite/sys_vars/t/optimizer_fix_basic.test 2011-04-09 18:49:05.000000000 +0400
6 @@ -0,0 +1 @@
7 +SELECT @@global.optimizer_fix;
8+diff -ruN a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
9+--- a/mysql-test/mysql-test-run.pl 2011-03-31 16:36:18.000000000 +0300
10++++ b/mysql-test/mysql-test-run.pl 2011-04-21 16:16:06.459164480 +0300
11+@@ -2181,6 +2181,7 @@
12+ $ENV{'DEFAULT_MASTER_PORT'}= $mysqld_variables{'port'};
13+ $ENV{'MYSQL_TMP_DIR'}= $opt_tmpdir;
14+ $ENV{'MYSQLTEST_VARDIR'}= $opt_vardir;
15++ $ENV{'MYSQL_LIBDIR64'}= "$basedir/lib64";
16+ $ENV{'MYSQL_LIBDIR'}= "$basedir/lib";
17+ $ENV{'MYSQL_BINDIR'}= "$bindir";
18+ $ENV{'MYSQL_SHAREDIR'}= $path_language;
19 diff -ruN a/mysql-test/suite/sys_vars/t/plugin_dir_basic.test b/mysql-test/suite/sys_vars/t/plugin_dir_basic.test
20 --- a/mysql-test/suite/sys_vars/t/plugin_dir_basic.test 2011-04-09 18:48:03.000000000 +0400
21 +++ b/mysql-test/suite/sys_vars/t/plugin_dir_basic.test 2011-04-09 18:49:05.000000000 +0400
22@@ -1284,21 +1295,21 @@
23 # on unix it's <basedir>/lib/mysql/plugin
24 #
25 ---replace_result $MYSQL_LIBDIR MYSQL_LIBDIR /mysql/ /
26-+--replace_result $MYSQL_LIBDIR MYSQL_LIBDIR MYSQL_LIBDIR64 MYSQL_LIBDIR /mysql/ /
27++--replace_result $MYSQL_LIBDIR64 MYSQL_LIBDIR $MYSQL_LIBDIR MYSQL_LIBDIR /mysql/ /
28 select @@global.plugin_dir;
29 --error ER_INCORRECT_GLOBAL_LOCAL_VAR
30 select @@session.plugin_dir;
31 ---replace_result $MYSQL_LIBDIR MYSQL_LIBDIR /mysql/ /
32-+--replace_result $MYSQL_LIBDIR MYSQL_LIBDIR MYSQL_LIBDIR64 MYSQL_LIBDIR /mysql/ /
33++--replace_result $MYSQL_LIBDIR64 MYSQL_LIBDIR $MYSQL_LIBDIR MYSQL_LIBDIR /mysql/ /
34 show global variables like 'plugin_dir';
35 ---replace_result $MYSQL_LIBDIR MYSQL_LIBDIR /mysql/ /
36-+--replace_result $MYSQL_LIBDIR MYSQL_LIBDIR MYSQL_LIBDIR64 MYSQL_LIBDIR /mysql/ /
37++--replace_result $MYSQL_LIBDIR64 MYSQL_LIBDIR $MYSQL_LIBDIR MYSQL_LIBDIR /mysql/ /
38 show session variables like 'plugin_dir';
39 ---replace_result $MYSQL_LIBDIR MYSQL_LIBDIR /mysql/ /
40-+--replace_result $MYSQL_LIBDIR MYSQL_LIBDIR MYSQL_LIBDIR64 MYSQL_LIBDIR /mysql/ /
41++--replace_result $MYSQL_LIBDIR64 MYSQL_LIBDIR $MYSQL_LIBDIR MYSQL_LIBDIR /mysql/ /
42 select * from information_schema.global_variables where variable_name='plugin_dir';
43 ---replace_result $MYSQL_LIBDIR MYSQL_LIBDIR /mysql/ /
44-+--replace_result $MYSQL_LIBDIR MYSQL_LIBDIR MYSQL_LIBDIR64 MYSQL_LIBDIR /mysql/ /
45++--replace_result $MYSQL_LIBDIR64 MYSQL_LIBDIR $MYSQL_LIBDIR MYSQL_LIBDIR /mysql/ /
46 select * from information_schema.session_variables where variable_name='plugin_dir';
47
48 #
49
50=== modified file 'series'
51--- series 2011-04-20 08:51:02 +0000
52+++ series 2011-04-21 16:12:26 +0000
53@@ -47,4 +47,4 @@
54 innodb_expand_fast_index_creation.patch
55 mysql-test.diff
56 innodb_bug60788.patch
57-
58+bug758934.patch

Subscribers

People subscribed via source and target branches