From: Bjorn Munch
Date: April 29 2011 1:35pm
Subject: bzr commit into mysql-5.5-mtr branch (bjorn.munch:3210) Bug#11759877
List-Archive: http://lists.mysql.com/commits/136420
X-Bug: 11759877
Message-Id: <201104291335.p3TDZX3B016331@khepri15.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0805933341=="

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

#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;


--===============0805933341==
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/repwrn-55/
# testament_sha1: 577f90b1ee753c9f233c3b97612cf7c76908f5c8
# timestamp: 2011-04-29 15:35:33 +0200
# base_revision_id: bjorn.munch@stripped\
#   ku7rbcvm15pjrm27
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWZkPplUAAdLfgGAQfef//36n
/yC////6UARmlvZR3bOi6AMJRCJtU8RT8SYMmIiY1PI0TI/UR6Jo0NPUaNBKUTaTym1TwJHpBhB6
GkAZGTRoNANMAlJkm1NTTKn4kT9NAjUD1A2oaDINAaaAZDjJk0YhiaYCBgTTBGCYmmmgAwgkkTUw
0JoZFPyhlNtFMnqaMgA0aAAGiccTVnb6+W4yJ65sy4tDSVsnL750CqGetz7IGuwiM9qobj4OKPPw
352dG/BZph8caiqefklckDxdamRYNl7BCeXbZfl79Wfd815YxzeZdM93207KXgWLxf3q627ls3jG
hpzyGZ3jRLqViKmAimywMxS9k9Wx9f6x25aIzrg1CwOaiKnEphVTkZ04trQyT6Imz5JzeIcDxYeg
M9RyNEcWv2jjbmXMiEYiSLS1iGd/E6J5Ia6kEZS3KI3njSMIYCchsBkpJEmrIli9VeEK5P0rEFop
OdT8KyRdedxviISUpmNDYqxNaCpSFrUPswsgVUUU5dWl44mFeZLS8JxRb2GVhEoYhKCiSHFfCMjg
CjKVBSIXOC8ViuNgpRApxgyIbMgmqFW8S6dMOtrB4F9SOoprFENNGsS13tQ1xlM44YbtIi4zJVyW
WCpB0CsI5b5Ln4aP4cdtcOTQZAnAjjqRJBi16ynlJi3XI5n7O8TvhZtsGt2rksK60i6aILadgM8b
hHiah43tooDh1I9M66re1orqEOAwvHnxwV6zMJm3VYcJbcyEM0Y3wouUiqQoktA4XoF48XcbtU1e
WVrBYvHm5kQpgjVFP95l/86T+ubveQ3lf1fP/hIGGZ3R8BC006hwg/poyVbKsOp+xKKijGI+Sscq
Qff+/Aw5TVSrdPS10sMYvfRWQWRx7dKHj2MTUN55eU9m8vXbkQj2kjQm6rod03B2RXSIdqHOl09M
p1qEOtCN0YUEg+3aHSaxWekLKzGXFXGh1l01Fl48DuuoJWYml+tBX7tDmSOxIt22B2Dgpu3uwllK
KVKutz1IM/NVXiPlQUIf48t1d+/kxWQFbgRafspMSsoix6ObgozmpjZAvz258Ez2oS06DloqYun2
GGqmd2xT0Uw4TYihPbHmbhhgtT6rkszrW8b3MJQr4UakEQ9ajJxFPDaqcOcvDip5Cvuswa2RvmbA
1QcsUM+qU2n+GBQDSp2OGyoHlmGAmip9kqOtlXEk4zcFIoVRSEMnVPM88DRKGUBScj8bpxEh1b0j
mDv6dom5eIK8AlWzWG4WYMzwlsikNW2HSoMVmrFzVKL63cwjUHKDmUOKov+ZkhA6Uibp1KuiLT3U
SPZIgnG8Y0PgyRKHAg4nrJTGKIMmW+naGTAE0DoY58ilXakc4OVIJr3rQWNYLubE6u9mUhkLQvUK
NLpbqOgYOqFBC9zrhMrR6S5ZwjNMiJseT40aQiFTJF0LDoJoM12Qcn5mGYzyM7ssRZOJp2jLODp1
ybMWx2BWpmZgoBh463TlqMw/H46oa2JXcCWRzZya1iIzImjRSTBEGHuUMu0W4KRZ5i6rvHB26Out
efekUGJzUl2hdfGEAbVCfaTkFeKksyjivniDSMobSQvlEl9Vt/4u5IpwoSEyH0yq


--===============0805933341==--