upmerge 12916194

aee2b4ba · Bjorn Munch · 22fbeb69 · f2d38ee5 · aee2b4ba
Commit aee2b4ba authored Sep 19, 2011 by Bjorn Munch
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 0 deletions

mysql-test/mysql-test-run.pl mysql-test/mysql-test-run.pl +5 -0

No files found.
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -4196,6 +4196,11 @@ sub extract_server_log ($$) {
      else
      {
 	push(@lines, $line);
+	if (scalar(@lines) > 1000000) {
+	  $Ferr = undef;
+	  mtr_warning("Too much log from test, bailing out from extracting");
+	  return ();
+	}
      }
    }
    else