MWL#55 : cherrypick MySQL 5.5 CMake/build improvements in order

to be able to build MSI based installer

1 files changed, 14 insertions, 3 deletions

diff --git a/mysql-test/lib/My/SafeProcess.pm b/mysql-test/lib/My/SafeProcess.pm
index bdd6c7352ae..0e1e27cccd2 100644
--- a/mysql-test/lib/My/SafeProcess.pm
+++ b/mysql-test/lib/My/SafeProcess.pm
@@ -84,23 +84,34 @@ sub is_child {
 
 my @safe_process_cmd;
 my $safe_kill;
+my $bindir;

+if(defined $ENV{MTR_BINDIR})

+{

+  # This is an out-of-source build. Build directory

+  # is given in MTR_BINDIR env.variable

+  $bindir = $ENV{MTR_BINDIR}."/mysql-test";

+}

+else

+{

+  $bindir = ".";

+}

 
 # Find the safe process binary or script
 sub find_bin {
   if (IS_WIN32PERL or IS_CYGWIN)
   {
     # Use my_safe_process.exe
-    my $exe= my_find_bin(".", ["lib/My/SafeProcess", "My/SafeProcess"],
+    my $exe= my_find_bin($bindir, ["lib/My/SafeProcess", "My/SafeProcess"],
 			 "my_safe_process");
     push(@safe_process_cmd, $exe);
 
     # Use my_safe_kill.exe
-    $safe_kill= my_find_bin(".", "lib/My/SafeProcess", "my_safe_kill");
+    $safe_kill= my_find_bin($bindir, "lib/My/SafeProcess", "my_safe_kill");
   }
   else
   {
     # Use my_safe_process
-    my $exe= my_find_bin(".", ["lib/My/SafeProcess", "My/SafeProcess"],
+    my $exe= my_find_bin($bindir, ["lib/My/SafeProcess", "My/SafeProcess"],
 			 "my_safe_process");
     push(@safe_process_cmd, $exe);
   }