summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorBjorn Munch <bjorn.munch@oracle.com>2011-09-19 16:06:35 +0200
committerBjorn Munch <bjorn.munch@oracle.com>2011-09-19 16:06:35 +0200
commit4896fc11b70274f903b89e329464bea122991192 (patch)
tree22edf3ccb718fd3f97ab315effb5dd243f9aadc6 /mysql-test
parente24d8bbf0af4d1312f431cf5274fd0fa38646d9f (diff)
downloadmariadb-git-4896fc11b70274f903b89e329464bea122991192.tar.gz
Bug #12916194 MTR SHOULD CUT OFF ANALYSIS OF SERVER LOG IF THERE IS TOO MUCH
Added simple cut-off w/warning if > one million lines
Diffstat (limited to 'mysql-test')
-rwxr-xr-xmysql-test/mysql-test-run.pl5
1 files changed, 5 insertions, 0 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 148339c3890..4e4333767da 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -3855,6 +3855,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