bzr push into mysql-5.1 branch (skozlov:2698 to 2699) Bug#39861

[Serge Kozlov]

 2699 Serge Kozlov	2008-11-15
      fix for bug#39861
modified:
  mysql-test/mysql-test-run.pl

 2698 Serge Kozlov	2008-11-14
      Bug#39861:
      1. mysqltest.cc - added flush to log file after each executed command in a testcase.
      2. mtr shows 20 last lines from test case log file if timeout reached.
      3. Optimizing the code by Magnus review.
      4. It is partially fix bug#40150
modified:
  client/mysqltest.cc
  mysql-test/lib/mtr_cases.pm
  mysql-test/lib/mtr_io.pl
  mysql-test/mysql-test-run.pl

=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2008-11-14 20:35:32 +0000
+++ b/mysql-test/mysql-test-run.pl	2008-11-14 21:44:56 +0000
@@ -3462,7 +3462,7 @@ sub check_expected_crash_and_restart {
 	# sleep a little and try again, thus allowing the
 	# test script to control when the server should start
 	# up again
-	my $last_line= mtr_lastlinefromfile($expect_file);
+	my $last_line= mtr_lastlinesfromfile($expect_file, 1);
 	if ($last_line =~ /^wait/ )
 	{
 	  mtr_verbose("Test says wait before restart");