From c6533f9eb3945a36608fd90a6f7100028da54c2c Mon Sep 17 00:00:00 2001
From: Bjorn Munch <Bjorn.Munch@sun.com>
Date: Sun, 18 Oct 2009 13:01:46 +0200
Subject: 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

---
 mysql-test/mysql-test-run.pl | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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
       {
-- 
cgit v1.2.1