diff options
| author | Bjorn Munch <bjorn.munch@oracle.com> | 2011-09-19 16:11:15 +0200 |
|---|---|---|
| committer | Bjorn Munch <bjorn.munch@oracle.com> | 2011-09-19 16:11:15 +0200 |
| commit | fe4f15f02de2752792e46960269299d56b79f636 (patch) | |
| tree | 540eb5cde14a1096831e5c27275a22d6ba64b570 /mysql-test/mysql-test-run.pl | |
| parent | 4d19a19d6e19d76d18fccd7e863ec8211a9de110 (diff) | |
| parent | 4896fc11b70274f903b89e329464bea122991192 (diff) | |
| download | mariadb-git-fe4f15f02de2752792e46960269299d56b79f636.tar.gz | |
upmerge 12916194
Diffstat (limited to 'mysql-test/mysql-test-run.pl')
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 288aa2dfda2..43267ad303b 100755 --- 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 |