bzr commit into mysql-5.5-mtr branch (bjorn.munch:3210) Bug#11759877

[Bjorn Munch]

#At file:///home/bm136801/my/repwrn-55/ based on revid:bjorn.munch@stripped

 3210 Bjorn Munch	2011-04-29
      Bug #11759877 52223: TEST "PLUGIN_DIR_BASIC" DOES NOT SUPPORT RPM BUILD (TEST) DIRECTORY STRUC
      Make a qualified guess: if $basedir/lib does not exist but $basedir/lib64
        does, then the latter is the proper value for $MYSQL_LIBDIR
      Tested on the RPMS of 5.5.12.

    modified:
      mysql-test/mysql-test-run.pl
=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2011-04-29 13:28:52 +0000
+++ b/mysql-test/mysql-test-run.pl	2011-04-29 13:35:02 +0000
@@ -2220,7 +2220,12 @@ sub environment_setup {
   $ENV{'DEFAULT_MASTER_PORT'}= $mysqld_variables{'port'};
   $ENV{'MYSQL_TMP_DIR'}=      $opt_tmpdir;
   $ENV{'MYSQLTEST_VARDIR'}=   $opt_vardir;
+  # Used for guessing default plugin dir, we can't really know for sure
   $ENV{'MYSQL_LIBDIR'}=       "$basedir/lib";
+  # Override if this does not exist, but lib64 does (best effort)
+  if (! -d "$basedir/lib" && -d "$basedir/lib64") {
+    $ENV{'MYSQL_LIBDIR'}=     "$basedir/lib64";
+  }
   $ENV{'MYSQL_BINDIR'}=       "$bindir";
   $ENV{'MYSQL_SHAREDIR'}=     $path_language;
   $ENV{'MYSQL_CHARSETSDIR'}=  $path_charsetsdir;


Attachment: [text/bzr-bundle] bzr/[e-mail]