database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

mysql-test-run.pl:

Browse Source 
Might need a restart after test with special TZ
  Removed unused argument to run_mysqltest()


mysql-test/mysql-test-run.pl:
  Might need a restart after test with special TZ
  Removed unused argument to run_mysqltest()
This commit is contained in:
unknown
2005-06-23 17:38:40 +02:00
parent a0fedf78e6
commit 744f6a1a99
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
mysql-test/mysql-test-run.pl
View File

@ -303,7 +303,7 @@ sub mysqld_arguments ($$$$$);
sub stop_masters_slaves (); sub stop_masters_slaves ();
sub stop_masters (); sub stop_masters ();
sub stop_slaves (); sub stop_slaves ();
sub run_mysqltest ($$); sub run_mysqltest ($);
sub usage ($); sub usage ($);
###################################################################### ######################################################################
@ -1345,10 +1345,11 @@ sub run_testcase ($) {
if ( ! $glob_use_running_server and ! $glob_use_embedded_server ) if ( ! $glob_use_running_server and ! $glob_use_embedded_server )
{ {
if ( $tinfo->{'master_restart'} or $master->[0]->{'uses_special_flags'} ) if ( $tinfo->{'master_restart'} or
$master->[0]->{'running_master_is_special'} )
{ {
stop_masters(); stop_masters();
$master->[0]->{'uses_special_flags'}= 0; # Forget about why we stopped $master->[0]->{'running_master_is_special'}= 0; # Forget why we stopped
} }
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
@ -1426,9 +1427,9 @@ sub run_testcase ($) {
} }
} }
if ( @{$tinfo->{'master_opt'}} ) if ( $tinfo->{'master_restart'} )
{ {
$master->[0]->{'uses_special_flags'}= 1; $master->[0]->{'running_master_is_special'}= 1;
} }
} }
@ -1475,7 +1476,7 @@ sub run_testcase ($) {
} }
unlink($path_timefile); unlink($path_timefile);
my $res= run_mysqltest($tinfo, $tinfo->{'master_opt'}); my $res= run_mysqltest($tinfo);
if ( $res == 0 ) if ( $res == 0 )
{ {
@ -1975,9 +1976,8 @@ sub stop_slaves () {
} }
sub run_mysqltest ($$) { sub run_mysqltest ($) {
my $tinfo= shift; my $tinfo= shift;
my $master_opts= shift;
my $cmdline_mysqldump= "$exe_mysqldump --no-defaults -uroot " . my $cmdline_mysqldump= "$exe_mysqldump --no-defaults -uroot " .
"--socket=$master->[0]->{'path_mysock'} --password="; "--socket=$master->[0]->{'path_mysock'} --password=";