From 749945c1fd96ef515fcc2054fab9b1e8917f3b37 Mon Sep 17 00:00:00 2001
From: Tor Didriksen <tor.didriksen@oracle.com>
Date: Wed, 16 Feb 2011 13:44:28 +0100
Subject: [PATCH] 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    | 1 +
 mysql-test/t/file_contents.test | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 3eb521a8fc2..b0295f8380a 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -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;
   
diff --git a/mysql-test/t/file_contents.test b/mysql-test/t/file_contents.test
index 61d684436f2..2a112e14495 100644
--- a/mysql-test/t/file_contents.test
+++ b/mysql-test/t/file_contents.test
@@ -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|;