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

Fixing problem where the command line for MYSQL_DUMP_SLAVE was not

Browse Source 
set properly.
This commit is contained in:
mats@romeo.(none)
2006-07-10 12:06:30 +02:00
parent 5488c269be
commit 7848edd065
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3273,9 +3273,16 @@ sub run_check_testcase ($) {
} }
sub generate_cmdline_mysqldump ($) {
my($info) = @_;
return
"$exe_mysqldump --no-defaults -uroot " .
"--port=$info->[0]->{'path_myport'} " .
"--socket=$info->[0]->{'path_mysock'} --password=";
}
sub run_mysqltest ($) { sub run_mysqltest ($) {
my $tinfo= shift; my $tinfo= shift;
my $cmdline_mysqlcheck= "$exe_mysqlcheck --no-defaults -uroot " . my $cmdline_mysqlcheck= "$exe_mysqlcheck --no-defaults -uroot " .
"--port=$master->[0]->{'path_myport'} " . "--port=$master->[0]->{'path_myport'} " .
"--socket=$master->[0]->{'path_mysock'} --password="; "--socket=$master->[0]->{'path_mysock'} --password=";
@ -3285,17 +3292,15 @@ sub run_mysqltest ($) {
" --debug=d:t:A,$opt_vardir_trace/log/mysqlcheck.trace"; " --debug=d:t:A,$opt_vardir_trace/log/mysqlcheck.trace";
} }
my $cmdline_mysqldump= "$exe_mysqldump --no-defaults -uroot " . my $cmdline_mysqldump= generate_cmdline_mysqldump $master;
"--port=$master->[0]->{'path_myport'} " . my $cmdline_mysqldumpslave= generate_cmdline_mysqldump $slave;
"--socket=$master->[0]->{'path_mysock'} --password=";
my $cmdline_mysqldumpslave= "$exe_mysqldump --no-defaults -uroot " .
"--socket=$slave->[0]->{'path_mysock'} --password=";
if ( $opt_debug ) if ( $opt_debug )
{ {
$cmdline_mysqldump .= $cmdline_mysqldump .=
" --debug=d:t:A,$opt_vardir_trace/log/mysqldump.trace"; " --debug=d:t:A,$opt_vardir_trace/log/mysqldump-master.trace";
$cmdline_mysqldumpslave .=
" --debug=d:t:A,$opt_vardir_trace/log/mysqldump-slave.trace";
} }
my $cmdline_mysqlslap; my $cmdline_mysqlslap;