mysql-test-run.pl:

  Removed -c from /bin/sh call
make_win_src_distribution.sh:
  Copy all content in mysql-test
make_win_binary_distribution.sh, make_binary_distribution.sh:
  Add Perl version of mysql-test-run to package
s_win32_dsp, s_win32, s_vxworks, s_test, s_readme, s_java, s_javah:
  Bug #6209 changes for building Berkeley DB from BitKeeper on Solaris


bdb/dist/s_javah:
  Bug #6209 changes for building Berkeley DB from BitKeeper on Solaris
bdb/dist/s_java:
  Bug #6209 changes for building Berkeley DB from BitKeeper on Solaris
bdb/dist/s_readme:
  Bug #6209 changes for building Berkeley DB from BitKeeper on Solaris
bdb/dist/s_test:
  Bug #6209 changes for building Berkeley DB from BitKeeper on Solaris
bdb/dist/s_vxworks:
  Bug #6209 changes for building Berkeley DB from BitKeeper on Solaris
bdb/dist/s_win32:
  Bug #6209 changes for building Berkeley DB from BitKeeper on Solaris
bdb/dist/s_win32_dsp:
  Bug #6209 changes for building Berkeley DB from BitKeeper on Solaris
scripts/make_binary_distribution.sh:
  Add Perl version of mysql-test-run to package
scripts/make_win_binary_distribution.sh:
  Add Perl version of mysql-test-run to package
scripts/make_win_src_distribution.sh:
  Copy all content in mysql-test
mysql-test/mysql-test-run.pl:
  Removed -c from /bin/sh call

1 files changed, 14 insertions, 4 deletions

diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 795df3623b0..f8adf372585 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -1535,6 +1535,7 @@ sub do_before_start_master ($$) {
        $tname ne "rpl_crash_binlog_ib_3b")
   {
     # FIXME we really want separate dir for binlogs
+    # FIXME replace 'rm' in backticks with portable Perl function
     `rm -f $glob_mysql_test_dir/var/log/master-bin*`;
 #    unlink("$glob_mysql_test_dir/var/log/master-bin*");
   }
@@ -1548,8 +1549,12 @@ sub do_before_start_master ($$) {
   # Run master initialization shell script if one exists
   if ( $init_script )
   {
-    # We ignore the return code
-    mtr_run("/bin/sh", ["-c",$init_script], "", "", "", "");
+    my $ret= mtr_run("/bin/sh", [$init_script], "", "", "", "");
+    if ( $ret != 0 )
+    {
+      # FIXME rewrite those scripts to return 0 if successful
+#      mtr_warning("$init_script exited with code $ret");
+    }
   }
   # for gcov  FIXME needed? If so we need more absolute paths
 # chdir($glob_basedir);
@@ -1566,6 +1571,7 @@ sub do_before_start_slave ($$) {
        $tname ne "rpl_crash_binlog_ib_3b" )
   {
     # FIXME we really want separate dir for binlogs
+    # FIXME replace 'rm' in backticks with portable Perl function
     `rm -fr $glob_mysql_test_dir/var/log/slave*-bin.*`;
 #    unlink("$glob_mysql_test_dir/var/log/slave*-bin.*"); # FIXME idx???
     # FIXME really master?!
@@ -1576,8 +1582,12 @@ sub do_before_start_slave ($$) {
   # Run slave initialization shell script if one exists
   if ( $init_script )
   {
-    # We ignore the return code
-    mtr_run("/bin/sh", ["-c",$init_script], "", "", "", "");
+    my $ret= mtr_run("/bin/sh", [$init_script], "", "", "", "");
+    if ( $ret != 0 )
+    {
+      # FIXME rewrite those scripts to return 0 if successful
+#      mtr_warning("$init_script exited with code $ret");
+    }
   }
 
   `rm -f $glob_mysql_test_dir/var/slave-data/log.*`;