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

[Oleg Tsarev]

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.

[lp:~percona-dev/percona-server/5.5.11-fix-bug-764152]

112. By Oleg Tsarev on 2011-04-21

remove excess patch

=== modified file 'mysql-test.diff'
--- mysql-test.diff	2011-04-09 15:20:23 +0000
+++ mysql-test.diff	2011-04-21 16:12:26 +0000
@@ -1276,6 +1276,17 @@
 +++ b/mysql-test/suite/sys_vars/t/optimizer_fix_basic.test	2011-04-09 18:49:05.000000000 +0400
 @@ -0,0 +1 @@
 +SELECT @@global.optimizer_fix;
+diff -ruN a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
+--- a/mysql-test/mysql-test-run.pl	2011-03-31 16:36:18.000000000 +0300
++++ b/mysql-test/mysql-test-run.pl	2011-04-21 16:16:06.459164480 +0300
+@@ -2181,6 +2181,7 @@
+   $ENV{'DEFAULT_MASTER_PORT'}= $mysqld_variables{'port'};
+   $ENV{'MYSQL_TMP_DIR'}=      $opt_tmpdir;
+   $ENV{'MYSQLTEST_VARDIR'}=   $opt_vardir;
++  $ENV{'MYSQL_LIBDIR64'}=     "$basedir/lib64";
+   $ENV{'MYSQL_LIBDIR'}=       "$basedir/lib";
+   $ENV{'MYSQL_BINDIR'}=       "$bindir";
+   $ENV{'MYSQL_SHAREDIR'}=     $path_language;
 diff -ruN a/mysql-test/suite/sys_vars/t/plugin_dir_basic.test b/mysql-test/suite/sys_vars/t/plugin_dir_basic.test
 --- a/mysql-test/suite/sys_vars/t/plugin_dir_basic.test	2011-04-09 18:48:03.000000000 +0400
 +++ b/mysql-test/suite/sys_vars/t/plugin_dir_basic.test	2011-04-09 18:49:05.000000000 +0400
@@ -1284,21 +1295,21 @@
  # on unix it's <basedir>/lib/mysql/plugin
  #
 ---replace_result $MYSQL_LIBDIR MYSQL_LIBDIR /mysql/ /
-+--replace_result $MYSQL_LIBDIR MYSQL_LIBDIR MYSQL_LIBDIR64 MYSQL_LIBDIR /mysql/ /
++--replace_result $MYSQL_LIBDIR64 MYSQL_LIBDIR $MYSQL_LIBDIR MYSQL_LIBDIR /mysql/ /
  select @@global.plugin_dir;
  --error ER_INCORRECT_GLOBAL_LOCAL_VAR
  select @@session.plugin_dir;
 ---replace_result $MYSQL_LIBDIR MYSQL_LIBDIR /mysql/ /
-+--replace_result $MYSQL_LIBDIR MYSQL_LIBDIR MYSQL_LIBDIR64 MYSQL_LIBDIR /mysql/ /
++--replace_result $MYSQL_LIBDIR64 MYSQL_LIBDIR $MYSQL_LIBDIR MYSQL_LIBDIR /mysql/ /
  show global variables like 'plugin_dir';
 ---replace_result $MYSQL_LIBDIR MYSQL_LIBDIR /mysql/ /
-+--replace_result $MYSQL_LIBDIR MYSQL_LIBDIR MYSQL_LIBDIR64 MYSQL_LIBDIR /mysql/ /
++--replace_result $MYSQL_LIBDIR64 MYSQL_LIBDIR $MYSQL_LIBDIR MYSQL_LIBDIR /mysql/ /
  show session variables like 'plugin_dir';
 ---replace_result $MYSQL_LIBDIR MYSQL_LIBDIR /mysql/ /
-+--replace_result $MYSQL_LIBDIR MYSQL_LIBDIR MYSQL_LIBDIR64 MYSQL_LIBDIR /mysql/ /
++--replace_result $MYSQL_LIBDIR64 MYSQL_LIBDIR $MYSQL_LIBDIR MYSQL_LIBDIR /mysql/ /
  select * from information_schema.global_variables where variable_name='plugin_dir';
 ---replace_result $MYSQL_LIBDIR MYSQL_LIBDIR /mysql/ /
-+--replace_result $MYSQL_LIBDIR MYSQL_LIBDIR MYSQL_LIBDIR64 MYSQL_LIBDIR /mysql/ /
++--replace_result $MYSQL_LIBDIR64 MYSQL_LIBDIR $MYSQL_LIBDIR MYSQL_LIBDIR /mysql/ /
  select * from information_schema.session_variables where variable_name='plugin_dir';
  
  #
 
=== modified file 'series'
--- series	2011-04-20 08:51:02 +0000
+++ series	2011-04-21 16:12:26 +0000
@@ -47,4 +47,4 @@
 innodb_expand_fast_index_creation.patch
 mysql-test.diff
 innodb_bug60788.patch
-
+bug758934.patch