diff options
| author | Bjorn Munch <Bjorn.Munch@sun.com> | 2009-10-18 13:01:46 +0200 |
|---|---|---|
| committer | Bjorn Munch <Bjorn.Munch@sun.com> | 2009-10-18 13:01:46 +0200 |
| commit | c6533f9eb3945a36608fd90a6f7100028da54c2c (patch) | |
| tree | 27bf3b264ecac5b939646bef5077a2762ea24e12 /mysql-test | |
| parent | dcf6aae40745f88c240955b9e252ebee7362f9a4 (diff) | |
| download | mariadb-git-c6533f9eb3945a36608fd90a6f7100028da54c2c.tar.gz | |
Bug #48133 MTR should not dump entire history of mysqld log when failing to start server
Don't print entire log, but use extract_server_log() introduced by 46007
Diffstat (limited to 'mysql-test')
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 40b1f242c34..e59b226825d 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -4702,7 +4702,8 @@ sub start_servers($) { my $logfile= $mysqld->value('#log-error'); if ( defined $logfile and -f $logfile ) { - $tinfo->{logfile}= mtr_fromfile($logfile); + my @srv_lines= extract_server_log($logfile, $tinfo->{name}); + $tinfo->{logfile}= "Server log is:\n" . join ("", @srv_lines); } else { |