diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-04-24 11:26:41 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-04-24 11:26:41 +0200 |
| commit | 8df792b709f7bbb55a57b090ef76aa276f65c76d (patch) | |
| tree | 63f978a0cccc978a9f4f58b0acb3f7c1d0783282 /mysql-test/lib | |
| parent | f3e00e9f096db03972a7cc59ffe4456c2baddeeb (diff) | |
| download | mariadb-git-8df792b709f7bbb55a57b090ef76aa276f65c76d.tar.gz | |
Bug#19084 ./mysql-test-run.pl do not print bootstrap run info
- Log boostratp/install to var/log/boostrap.log
- Log output from mysqladmin to var/log/mysqladmin.log
- Remove old manager references
mysql-test/lib/mtr_process.pl:
Log output from mysqladmin to var/log/mysqladmin.log
mysql-test/mysql-test-run.pl:
Log output from boostrap/install of db's to var/log/bootstrap.log
Remove references to old manager
Diffstat (limited to 'mysql-test/lib')
| -rw-r--r-- | mysql-test/lib/mtr_process.pl | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/mysql-test/lib/mtr_process.pl b/mysql-test/lib/mtr_process.pl index 3ccf3d9bbba..c41978127b3 100644 --- a/mysql-test/lib/mtr_process.pl +++ b/mysql-test/lib/mtr_process.pl @@ -663,8 +663,6 @@ sub mtr_mysqladmin_shutdown { foreach my $srv ( @to_kill_specs ) { - # FIXME wrong log..... - # FIXME, stderr..... # Shutdown time must be high as slave may be in reconnect my $args; @@ -688,11 +686,14 @@ sub mtr_mysqladmin_shutdown { mtr_add_arg($args, "--connect_timeout=5"); mtr_add_arg($args, "--shutdown_timeout=$adm_shutdown_tmo"); mtr_add_arg($args, "shutdown"); - # We don't wait for termination of mysqladmin + + my $path_mysqladmin_log= "$::opt_vardir/log/mysqladmin.log"; my $pid= mtr_spawn($::exe_mysqladmin, $args, - "", $::path_manager_log, $::path_manager_log, "", + "", $path_mysqladmin_log, $path_mysqladmin_log, "", { append_log_file => 1 }); $mysql_admin_pids{$pid}= 1; + + # We don't wait for termination of mysqladmin } # As mysqladmin is such a simple program, we trust it to terminate. |