1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00

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
This commit is contained in:
kent@mysql.com
2005-03-09 01:34:22 +01:00
parent fa001505e3
commit c6002966be
11 changed files with 35 additions and 17 deletions

View File

@ -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.*`;