From: Tor Didriksen
Date: February 16 2011 12:57pm
Subject: bzr commit into mysql-5.5 branch (tor.didriksen:3329) Bug#11751935
List-Archive: http://lists.mysql.com/commits/131417
X-Bug: 11751935
Message-Id: <20110216125716.5F0693780@atum07.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2238819106435716894=="

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

#At file:///export/home/didrik/repo/5.5/ based on revid:bjorn.munch@stripped

 3329 Tor Didriksen	2011-02-16
      Bug #11751935 42969: PLEASE ADD A MANIFEST TO EACH BUILD
      post-push fix: make it work in out-of-source builds.
     @ mysql-test/mysql-test-run.pl
        Set MYSQL_BINDIR, to be used by tests.
     @ mysql-test/t/file_contents.test
        Use MYSQL_BINDIR, which is different from MYSQL_LIBDIR for out-of-source builds.

    modified:
      mysql-test/mysql-test-run.pl
      mysql-test/t/file_contents.test
=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2011-02-16 11:24:17 +0000
+++ b/mysql-test/mysql-test-run.pl	2011-02-16 12:44:28 +0000
@@ -2160,6 +2160,7 @@ sub environment_setup {
   $ENV{'MYSQL_TMP_DIR'}=      $opt_tmpdir;
   $ENV{'MYSQLTEST_VARDIR'}=   $opt_vardir;
   $ENV{'MYSQL_LIBDIR'}=       "$basedir/lib";
+  $ENV{'MYSQL_BINDIR'}=       "$bindir";
   $ENV{'MYSQL_SHAREDIR'}=     $path_language;
   $ENV{'MYSQL_CHARSETSDIR'}=  $path_charsetsdir;
   

=== modified file 'mysql-test/t/file_contents.test'
--- a/mysql-test/t/file_contents.test	2011-02-11 14:55:25 +0000
+++ b/mysql-test/t/file_contents.test	2011-02-16 12:44:28 +0000
@@ -10,7 +10,7 @@
 
 --perl
 print "\nChecking 'INFO_SRC' and 'INFO_BIN'\n";
-$dir_docs = $ENV{'MYSQL_LIBDIR'};
+$dir_docs = $ENV{'MYSQL_BINDIR'};
 if($dir_docs =~ m|/usr/|) {
   # RPM package
   $dir_docs =~ s|/lib|/share/doc|;


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

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: tor.didriksen@stripped\
#   wuvvj1v2rwhn8a9k
# target_branch: file:///export/home/didrik/repo/5.5/
# testament_sha1: a37de20197414caf4bc6a702fd120554bd0b0652
# timestamp: 2011-02-16 13:57:16 +0100
# source_branch: file:///export/home/didrik/repo/trunk/
# base_revision_id: bjorn.munch@stripped\
#   jxojuauh0o9xbqu4
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWfeu7GcAAmtfgAgQXOf//39n
/yC////6UAVleBdYPWhUgCjwkkIp6U2mwm1TNCHqeRDEIPUBpgg0BoGqaJtCYhpoBkB6QAaAyaBo
yDQaEKR+qAwhk0ekMmgaADEBppoxA0aBqnqRtIaBoDIaA0GmQNAGmmgyeoGgkkmTQAmI0ATU8Sep
NPZSGENNAGjJodRHOWDeNfcS5rMhFlDNXZQCzb4YHs510KVxw7HPwxPgcYwzMx49yPKEo07FTE8H
4mkfJN5Ua9vl69mLv+2z42wPBc8Ve0BviyaCKSqYnskPOChAM5STTYpzbXcraDTALFlMAwi5IvVO
rzLCFLjgKFQtAk+S9Qytk4Qzn3WiQkYM8CoJ6AOq2O1ufCcSyEPsQMi8yrGZ9cSCR0bYrGQEl+AS
YD0BbL6cy/kgt6KHJ0SEk5oCoCU2eEqAyLsi7rUgKFUE2YGF3jNxjCxMEUFdEtH1Vznu7RoM4UkC
QPjZKrTQqwDFxmCarfNlHRLqa4uHloxlPIpZVgviB7baJRzpMmBGFApGQtCiAS3PYbBylmnQa2mw
lcjia7h5R8gP8sppokaSvWtayQ3rcc3JiVm2SaWVWU3wtI/3dySDMszaGGVYOMaCcnkIAQAkjQAl
VjGo2AA69mVFddhQS+CRpiYEkM4VCORGtljURkxmNW3zZVkDCnYt4ynDgorHZblSZV5yGnAVjXLP
dlRcr+TkLSQHEOjo5yce9x1cQM81zsnBEoLSk0DSYdVRTUF2Z6oHOdPDYbr8zXFOaml4WhnqIXsp
r1CWydA6tTDFstDWlFNVFFNcM4FcR3SF8TzK/MNmfWV7Z65nUEzW3geKsDPzrlqMGhO62AM+Rpc5
dFoySspE+L3hAdF7pFCKGg0T/uPRbpG3YlQ2pmWoZ0z4cstAJhATNxQoy54IiQLx+AMk1vieRZ8g
J+yNN7A846U3zoCpEvyu+aK/7GUAuvP3feiCIfREuMJXVtaaEZkRR2MrRrGR354I1jhexXnq3blN
tJiTp2G1B1+7dP3PbiJV4d3KRHl68id9E6WiI4b3huzXso/D1rWakXnh34hNRL7AfKVpoLT9iW2k
4UlJSseF5oLNWpDTTuYS96Sv8ke59q0ExfuvONRoiOsCf75wkwII5VsZhHBa47KcJ0iobCVX3kD4
anPYA9uO1Ocfi1LfhrhoPOU2mkwvwrU56CZHRy3Wl+Phm4N/l49MW5M/BnqtbB+XE6RUH5qxDg9F
0mXhG3hw2KIhmR2pRlzeiGZUmg9LrjhYdBkldNz3QeohUH8NOs5u1nuYrX+uHJ7N03RWakCu3wt5
jAHF1jM9EBYZ0HNprRMauJUbGj1UML53CH3USBWpki83CUDUakds1P+79D8kWE+pDeNcDzwAeuK8
lRYGvtxDreHiatLkO5O8NyLEi/6w5IsCKejGQ3MXzIqEmL2QUd7Nc9aKd8uIBrwU5YqjT+yjbLKs
vUEdno9Ep9NqMbNLWXA9DjxXnA4yERDYl8QnF5KDinOpgehk9kDKfJuXYGtmnXkugP8ACg9TLpIh
576qxGgSZHaRVhzemv5dDScHIwk2sMJ680eKJ+m2M9Hatk4R0zVBUcNLhG9ZKSRIIVlcsUnWXp51
3pE4F2T8O6jLjFN6gJFtzS0xZhadeSh+mGPdIzua1i8rQxzrCyU6nVpuHIRaBiyT0MD06q/qql10
xCp+MeE7GyaQ5whKzmeivUHTEGcy8ENOseWI6DrDJMO7VorW9nAyJ2DDUGkILX7LQ6HHnGlHmCfA
w5uLvED0gRtV6y4I3gNz4AWbrbgGpkAu09w0KmCxByJ3sMqN3akR1XOTY9cUSKMrKyjoP4u5Ipwo
SHvXdjOA


--===============2238819106435716894==--