bzr push into mysql-6.0-rpl branch (skozlov:2732 to 2733)

[Serge Kozlov]

 2733 Serge Kozlov	2008-11-15
      Fix for calling mtr_lastlinesfromfile
modified:
  mysql-test/mysql-test-run.pl

 2732 Serge Kozlov	2008-11-14 [merge]
      (no message)
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:47:02 +0000
+++ b/mysql-test/mysql-test-run.pl	2008-11-14 21:37:26 +0000
@@ -3510,7 +3510,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");