mirror of
https://github.com/MariaDB/server.git
synced 2025-08-09 22:24:09 +03:00
Backported the fix to 5.1. Problem: the auxiliary test files rpl_start_server.inc and rpl_stop_server.inc write a file that is later read by mtr. The bug was that the file was written with platform-dependent newline terminators, i.e., \r\n on windows, whereas mtr only understands \n. Fix: write the file so that it uses \n on all platforms. mysql-test/include/rpl_start_server.inc: Force test to use \n instead of platform-dependent newline terminator. mysql-test/include/rpl_stop_server.inc: Force test to use \n instead of platform-dependent newline terminator.
63 lines
1.8 KiB
PHP
63 lines
1.8 KiB
PHP
# ==== Purpose ====
|
|
#
|
|
# Start the server given by $rpl_server_number. This should normally
|
|
# be invoked after rpl_stop_server.inc.
|
|
#
|
|
# ==== Usage ====
|
|
#
|
|
# --let $rpl_server_number= N
|
|
# [--let $rpl_server_parameters= --flag1 --flag2 ...]
|
|
# [--let $rpl_debug= 1]
|
|
# --source include/rpl_start_server.inc
|
|
#
|
|
# Parameters:
|
|
#
|
|
# $rpl_server_number
|
|
# Number to identify the server that needs to reconnect. 1 is the
|
|
# master server, 2 the slave server, 3 the 3rd server, and so on.
|
|
# Cf. include/rpl_init.inc
|
|
#
|
|
# $rpl_server_parameters
|
|
# If set, extra parameters given by this variable are passed to
|
|
# mysqld.
|
|
#
|
|
# $rpl_debug
|
|
# See include/rpl_init.inc
|
|
#
|
|
# ==== See also ====
|
|
#
|
|
# rpl_stop_server.inc
|
|
# rpl_restart_server.inc
|
|
|
|
|
|
--let $_rpl_start_server_command= restart
|
|
--let $_rpl_start_server_args= [server_number=$rpl_server_number]
|
|
if ($rpl_server_parameters)
|
|
{
|
|
--let $_rpl_start_server_command= restart:$rpl_server_parameters
|
|
--let $_rpl_start_server_args= [server_number=$rpl_server_number parameters: $rpl_server_parameters]
|
|
}
|
|
|
|
--let $include_filename= rpl_start_server.inc $_rpl_start_server_args
|
|
--source include/begin_include_file.inc
|
|
|
|
--let $rpl_connection_name= server_$rpl_server_number
|
|
--source include/rpl_connection.inc
|
|
|
|
# Write file to make mysql-test-run.pl start up the server again
|
|
--let WRITE_TO_FILE= $MYSQLTEST_VARDIR/tmp/mysqld.$rpl_server_number.expect
|
|
--let WRITE_TO_VAR= $_rpl_start_server_command
|
|
perl;
|
|
my $file= $ENV{'WRITE_TO_FILE'};
|
|
my $var= $ENV{'WRITE_TO_VAR'};
|
|
open WRITE_FILE, ">> $file" or die "Error opening $file: $!";
|
|
print WRITE_FILE $var, "\n" or die "Error appending to $file: $!";
|
|
close WRITE_FILE or die "Error closing $file: $!";
|
|
EOF
|
|
|
|
--source include/rpl_reconnect.inc
|
|
|
|
|
|
--let $include_filename= rpl_start_server.inc $_rpl_start_server_args
|
|
--source include/end_include_file.inc
|