mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
Cleanup formatting
This commit is contained in:
msvensson@neptunus.(none)
@ -1223,6 +1223,7 @@ sub signal_setup () {
|
||||
$SIG{INT}= \&handle_int_signal;
|
||||
}
|
||||
|
||||
|
||||
sub handle_int_signal () {
|
||||
$SIG{INT}= 'DEFAULT'; # If we get a ^C again, we die...
|
||||
mtr_warning("got INT signal, cleaning up.....");
|
||||
@ -1438,7 +1439,6 @@ sub check_ndbcluster_support () {
|
||||
return;
|
||||
}
|
||||
|
||||
# FIXME why is there a different start below?!
|
||||
|
||||
sub ndbcluster_install () {
|
||||
|
||||
@ -1465,6 +1465,7 @@ sub ndbcluster_install () {
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
sub ndbcluster_start ($) {
|
||||
my $use_ndbcluster= shift;
|
||||
|
||||
@ -1497,6 +1498,7 @@ sub ndbcluster_start ($) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
sub ndbcluster_stop () {
|
||||
if ( ! $using_ndbcluster_master or $glob_use_running_ndbcluster )
|
||||
{
|
||||
@ -1594,6 +1596,7 @@ sub run_tests () {
|
||||
run_suite($opt_suite);
|
||||
}
|
||||
|
||||
|
||||
sub run_suite () {
|
||||
my $suite= shift;
|
||||
|
||||
@ -1756,15 +1759,15 @@ sub im_create_passwd_file($) {
|
||||
my $instance_manager = shift;
|
||||
|
||||
my $pwd_file_path = $instance_manager->{'password_file'};
|
||||
|
||||
|
||||
mtr_report("Creating IM password file ($pwd_file_path)");
|
||||
|
||||
|
||||
open(OUT, ">", $pwd_file_path)
|
||||
or mtr_error("Can't write to $pwd_file_path: $!");
|
||||
|
||||
|
||||
print OUT $instance_manager->{'admin_login'}, ":",
|
||||
$instance_manager->{'admin_sha1'}, "\n";
|
||||
|
||||
|
||||
close(OUT);
|
||||
}
|
||||
|
||||
@ -1776,7 +1779,7 @@ sub im_create_defaults_file($) {
|
||||
|
||||
open(OUT, ">", $defaults_file)
|
||||
or mtr_error("Can't write to $defaults_file: $!");
|
||||
|
||||
|
||||
print OUT <<EOF
|
||||
[mysql]
|
||||
|
||||
@ -1934,7 +1937,7 @@ sub run_testcase ($) {
|
||||
# ----------------------------------------------------------------------
|
||||
|
||||
stop_slaves();
|
||||
}
|
||||
}
|
||||
|
||||
# ----------------------------------------------------------------------
|
||||
# Prepare to start masters. Even if we use embedded, we want to run
|
||||
@ -1947,9 +1950,9 @@ sub run_testcase ($) {
|
||||
|
||||
mtr_tofile($master->[0]->{'path_myerr'},"CURRENT_TEST: $tname\n");
|
||||
|
||||
# FIXME test cases that depend on each other, prevent this from
|
||||
# being at this location.
|
||||
# do_before_start_master($tname,$tinfo->{'master_sh'});
|
||||
# FIXME test cases that depend on each other, prevent this from
|
||||
# being at this location.
|
||||
# do_before_start_master($tname,$tinfo->{'master_sh'});
|
||||
|
||||
# ----------------------------------------------------------------------
|
||||
# If any mysqld servers running died, we have to know
|
||||
@ -2125,6 +2128,7 @@ sub run_testcase ($) {
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
#
|
||||
# Save a snapshot of the installed test db(s)
|
||||
# I.e take a snapshot of the var/ dir
|
||||
@ -2161,6 +2165,7 @@ sub save_files_before_restore($$) {
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
#
|
||||
# Restore snapshot of the installed test db(s)
|
||||
# if the snapshot exists
|
||||
@ -2230,9 +2235,9 @@ sub report_failure_and_restart ($) {
|
||||
#
|
||||
##############################################################################
|
||||
|
||||
|
||||
# The embedded server needs the cleanup so we do some of the start work
|
||||
# but stop before actually running mysqld or anything.
|
||||
|
||||
sub do_before_start_master ($$) {
|
||||
my $tname= shift;
|
||||
my $init_script= shift;
|
||||
@ -2265,13 +2270,14 @@ sub do_before_start_master ($$) {
|
||||
if ( $ret != 0 )
|
||||
{
|
||||
# FIXME rewrite those scripts to return 0 if successful
|
||||
# mtr_warning("$init_script exited with code $ret");
|
||||
# mtr_warning("$init_script exited with code $ret");
|
||||
}
|
||||
}
|
||||
# for gcov FIXME needed? If so we need more absolute paths
|
||||
# chdir($glob_basedir);
|
||||
# chdir($glob_basedir);
|
||||
}
|
||||
|
||||
|
||||
sub do_before_start_slave ($$) {
|
||||
my $tname= shift;
|
||||
my $init_script= shift;
|
||||
@ -2299,7 +2305,7 @@ sub do_before_start_slave ($$) {
|
||||
if ( $ret != 0 )
|
||||
{
|
||||
# FIXME rewrite those scripts to return 0 if successful
|
||||
# mtr_warning("$init_script exited with code $ret");
|
||||
# mtr_warning("$init_script exited with code $ret");
|
||||
}
|
||||
}
|
||||
|
||||
@ -2309,6 +2315,7 @@ sub do_before_start_slave ($$) {
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
sub mysqld_arguments ($$$$$$) {
|
||||
my $args= shift;
|
||||
my $type= shift; # master/slave/bootstrap
|
||||
@ -2532,14 +2539,6 @@ sub mysqld_arguments ($$$$$$) {
|
||||
return $args;
|
||||
}
|
||||
|
||||
# FIXME
|
||||
# if ( $type eq 'master' and $glob_use_embedded_server )
|
||||
# {
|
||||
# # Add a -A to each argument to pass it to embedded server
|
||||
# my @mysqltest_opt= map {("-A",$_)} @args;
|
||||
# $opt_extra_mysqltest_opt= \@mysqltest_opt;
|
||||
# return;
|
||||
# }
|
||||
|
||||
##############################################################################
|
||||
#
|
||||
@ -2639,6 +2638,7 @@ sub mysqld_start ($$$$$) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
sub stop_masters_slaves () {
|
||||
|
||||
print "Ending Tests\n";
|
||||
@ -2648,7 +2648,7 @@ sub stop_masters_slaves () {
|
||||
print "Shutting-down Instance Manager\n";
|
||||
im_stop($instance_manager);
|
||||
}
|
||||
|
||||
|
||||
print "Shutting-down MySQL daemon\n\n";
|
||||
stop_masters();
|
||||
print "Master(s) shutdown finished\n";
|
||||
@ -2656,6 +2656,7 @@ sub stop_masters_slaves () {
|
||||
print "Slave(s) shutdown finished\n";
|
||||
}
|
||||
|
||||
|
||||
sub stop_masters () {
|
||||
|
||||
my @args;
|
||||
@ -2685,6 +2686,7 @@ sub stop_masters () {
|
||||
mtr_stop_mysqld_servers(\@args);
|
||||
}
|
||||
|
||||
|
||||
sub stop_slaves () {
|
||||
my $force= shift;
|
||||
|
||||
@ -2727,7 +2729,7 @@ sub im_start($$) {
|
||||
mtr_add_arg($args, $opt);
|
||||
}
|
||||
|
||||
$instance_manager->{'pid'} =
|
||||
$instance_manager->{'pid'} =
|
||||
mtr_spawn(
|
||||
$exe_im, # path to the executable
|
||||
$args, # cmd-line args
|
||||
@ -2743,7 +2745,7 @@ sub im_start($$) {
|
||||
mtr_report('Could not start Instance Manager');
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
# Instance Manager can be run in daemon mode. In this case, it creates
|
||||
# several processes and the parent process, created by mtr_spawn(), exits just
|
||||
# after start. So, we have to obtain Instance Manager PID from the PID file.
|
||||
@ -2761,6 +2763,7 @@ sub im_start($$) {
|
||||
mtr_get_pid_from_file($instance_manager->{'path_pid'});
|
||||
}
|
||||
|
||||
|
||||
sub im_stop($) {
|
||||
my $instance_manager = shift;
|
||||
|
||||
@ -2795,12 +2798,13 @@ sub im_stop($) {
|
||||
# Kill processes.
|
||||
|
||||
mtr_kill_processes(\@pids);
|
||||
|
||||
|
||||
stop_reap_all();
|
||||
|
||||
$instance_manager->{'pid'} = undef;
|
||||
}
|
||||
|
||||
|
||||
#
|
||||
# Run include/check-testcase.test
|
||||
# Before a testcase, run in record mode, save result file to var
|
||||
@ -2849,6 +2853,7 @@ sub run_check_testcase ($) {
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
sub run_mysqltest ($) {
|
||||
my $tinfo= shift;
|
||||
|
||||
@ -3185,6 +3190,7 @@ sub gdb_arguments {
|
||||
$$exe= "xterm";
|
||||
}
|
||||
|
||||
|
||||
#
|
||||
# Modify the exe and args so that program is run in ddd
|
||||
#
|
||||
@ -3430,18 +3436,18 @@ Deprecated options
|
||||
|
||||
Options not yet described, or that I want to look into more
|
||||
|
||||
big-test
|
||||
debug
|
||||
local
|
||||
local-master
|
||||
netware
|
||||
old-master
|
||||
sleep=SECONDS
|
||||
socket=PATH
|
||||
user-test=s
|
||||
wait-timeout=SECONDS
|
||||
warnings
|
||||
log-warnings
|
||||
big-test
|
||||
debug
|
||||
local
|
||||
local-master
|
||||
netware
|
||||
old-master
|
||||
sleep=SECONDS
|
||||
socket=PATH
|
||||
user-test=s
|
||||
wait-timeout=SECONDS
|
||||
warnings
|
||||
log-warnings
|
||||
|
||||
HERE
|
||||
mtr_exit(1);
|
||||
|
||||
Reference in New Issue
Block a user