From: Bjorn Munch
Date: April 28 2011 1:46pm
Subject: bzr commit into mysql-5.5-mtr branch (bjorn.munch:3207) Bug#11759877
List-Archive: http://lists.mysql.com/commits/136307
X-Bug: 11759877
Message-Id: <201104281346.p3SDkBO1012416@khepri15.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2012268453=="

--===============2012268453==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

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

 3207 Bjorn Munch	2011-04-28
      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-27 07:45:23 +0000
+++ b/mysql-test/mysql-test-run.pl	2011-04-28 13:43:45 +0000
@@ -2221,6 +2221,10 @@ sub environment_setup {
   $ENV{'MYSQL_TMP_DIR'}=      $opt_tmpdir;
   $ENV{'MYSQLTEST_VARDIR'}=   $opt_vardir;
   $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;


--===============2012268453==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/bjorn.munch@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: bjorn.munch@stripped
# target_branch: file:///home/bm136801/my/libdir-55/
# testament_sha1: fa3f54d464c1082c13b850924861af434fb8ce7b
# timestamp: 2011-04-28 15:46:11 +0200
# base_revision_id: bjorn.munch@stripped\
#   9awqojg43isixii6
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWYlXhd4AAbrfgGAQfef//36n
/yC////6UAQm8da2Ordte5L2sGhCTJhTEZpPSeFMmTaQ0wjRppkaPUNPSGglIkn6p5PKM0GiR6j1
BoDRoAAAAABKJoCEwRTek1PT1TamgAAGIAaNBoeoJJINU2T1T1D0EHqekNqGmhoAAAAABJIgBTxT
xFNg0ap5PRTTRtR6g0AAAAoQyDh7/1szHCIcc0RJHgy1wBcklU9UWpdgEnQYGody9m70pjTHTyS3
WvWcwZ7qA6tsHdMQox9BR4xvO68NqjamdVftv0a9sIqaHdO/sVyg2bpzoXxi+PS4MSV2UtVnpw5f
BTb+eDPybqzlDwTQwPExyYuZjpdx7HBp7cI389Z+BHRaEp4RaZNek3vNs/E4y6GNqROJUNI+lGaE
XW2yYuxoekRWkDEA8RSM4h74VXqFYxDqBmU87xElhl69EoiVRtUZHEcnAwqkxrHkuAS+nYfLcN8e
LYonUjsNlV4Y4mmouYmLIST0lLCK5jIZWuT2TwjHSNkZwQEDhTVGDxOLGMxlEe21wjgI2YzJQbNq
3hvlI66lSLQjedTxEBCKE1eQHirC67U+e5DZCgtHf00ENdoltFS1xBmGiFOdAkhiEner7NCmNgoc
WD5WDQrszcAsWnhgjydMwvE3dksstg5wKpG0gGmkVEfZla5KRTPYJxjYwEgTK+F8hqTqYsiaHXal
ri9TQk/QuwG7lRXk7XayC1NqV7WsRcixWBIJSXk08p7ad3XxZOUVvZPhIhEx0yMfnwIKJxvWr6cD
VQ3Mnt95g64PNN20CB4U7xSv8abzGdJW9UdeJC68okTGitX9ur7jEidc3N0dDYRy5V2Fvg0YJZrh
DFIoQaMIWWc8oXmGPENGR3qHhqIg1WzV1hD95+uDmTOQehvJzdQnIFziOjFEFcSsqFJe1eEOIyjO
/U7sDoMDXiERf3D3HaSakKvbI5kiAXtSKZvUMUL95vTg1IHoCuNkiiiYOkKcvCzAQtgMpqifXfhf
WFAE+efvUNgJbsRzYzaXFIDm3N7o89C2171XWV0PtVL9LH5DrIyrSRVVWGmRltO1HzSuBNKB8COy
SiY2HDiEPOhXZgwXm2a7dTKx7aIrmQIIxP1j9GBVBdUzYRM1dCiM0LM2ZJrcfenu5sktawJcQqIl
ERcAq8Ge19wUCzybgxCkwjRW4vFgGYiOzckS5TXnDFa7wqCpwc/NKkNO2PdUjF+BfstimFBQlpSN
ROtQL1hLJIbiRoZMKomntXWckRpxAVg4uRwZIygxEjpqB5OiNky3UbAhtC4E6I6mN8ak/iRvByoB
Ne9WlebOrKc7KjyBsSnBGM+QUN6D55cK6hFTSPRE44IVZzJbpzRKmKgxksjNTKOUUGGYojZ0EQT5
ngM9VViwarYMwsKKqhWCjDstFpcNi2xSDu2Qe5by7FTrCqhJNNOSBODD3KGmqEsgFNt6b9c65bEi
bUbaCytejMisJb5SC0GMoypUBo4SBrLUPngmgaOWn/N8f+LuSKcKEhEq8LvA


--===============2012268453==--