Commit efe1ca20 authored by unknown's avatar unknown

Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl

into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile

parents bb46b2bf 000255ee
No related merge requests found
This diff is collapsed.
...@@ -1251,7 +1251,7 @@ sub install_db ($$) { ...@@ -1251,7 +1251,7 @@ sub install_db ($$) {
} }
else else
{ {
print OUT $_; print OUT "$_ ";
} }
} }
close OUT; close OUT;
...@@ -1521,7 +1521,7 @@ sub report_failure_and_restart ($) { ...@@ -1521,7 +1521,7 @@ sub report_failure_and_restart ($) {
sub do_before_start_master ($$) { sub do_before_start_master ($$) {
my $tname= shift; my $tname= shift;
my $master_init_script= shift; my $init_script= shift;
# FIXME what about second master..... # FIXME what about second master.....
...@@ -1542,10 +1542,10 @@ sub do_before_start_master ($$) { ...@@ -1542,10 +1542,10 @@ sub do_before_start_master ($$) {
unlink("$glob_mysql_test_dir/var/master1-data/relay-log.info"); unlink("$glob_mysql_test_dir/var/master1-data/relay-log.info");
# Run master initialization shell script if one exists # Run master initialization shell script if one exists
if ( $master_init_script and if ( $init_script )
mtr_run($master_init_script, [], "", "", "", "") != 0 )
{ {
mtr_error("Can't run $master_init_script"); # We ignore the return code
mtr_run("/bin/sh", ["-c",$init_script], "", "", "", "");
} }
# for gcov FIXME needed? If so we need more absolute paths # for gcov FIXME needed? If so we need more absolute paths
# chdir($glob_basedir); # chdir($glob_basedir);
...@@ -1553,7 +1553,7 @@ sub do_before_start_master ($$) { ...@@ -1553,7 +1553,7 @@ sub do_before_start_master ($$) {
sub do_before_start_slave ($$) { sub do_before_start_slave ($$) {
my $tname= shift; my $tname= shift;
my $slave_init_script= shift; my $init_script= shift;
# Remove stale binary logs and old master.info files # Remove stale binary logs and old master.info files
# except for too tests which need them # except for too tests which need them
...@@ -1570,10 +1570,10 @@ sub do_before_start_slave ($$) { ...@@ -1570,10 +1570,10 @@ sub do_before_start_slave ($$) {
} }
# Run slave initialization shell script if one exists # Run slave initialization shell script if one exists
if ( $slave_init_script and if ( $init_script )
mtr_run($slave_init_script, [], "", "", "", "") != 0 )
{ {
mtr_error("Can't run $slave_init_script"); # We ignore the return code
mtr_run("/bin/sh", ["-c",$init_script], "", "", "", "");
} }
`rm -f $glob_mysql_test_dir/var/slave-data/log.*`; `rm -f $glob_mysql_test_dir/var/slave-data/log.*`;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment