summaryrefslogtreecommitdiff
path: root/mysql-test/lib/mtr_process.pl
diff options
context:
space:
mode:
authorunknown <joerg@mysql.com>2006-04-07 13:02:15 +0200
committerunknown <joerg@mysql.com>2006-04-07 13:02:15 +0200
commit8fc0c48d5e929e7dcd38721a220d03c0f0979c74 (patch)
treeb7162db77c0e0a079f6b62b8f14d5e788d41c818 /mysql-test/lib/mtr_process.pl
parent6206e7c2283aefd02b06e0250b17db92838212d2 (diff)
downloadmariadb-git-8fc0c48d5e929e7dcd38721a220d03c0f0979c74.tar.gz
Perl test script: Avoid some aborts, which made the whole build/test process terminate.
mysql-test/lib/mtr_process.pl: Change from "mtr_error()" to "mtr_warning()" on some problems, because "error" makes the whole suite abort which then makes "Do-compile" terminate, so none of the following steps (including other etst suites) will be done.
Diffstat (limited to 'mysql-test/lib/mtr_process.pl')
-rw-r--r--mysql-test/lib/mtr_process.pl5
1 files changed, 2 insertions, 3 deletions
diff --git a/mysql-test/lib/mtr_process.pl b/mysql-test/lib/mtr_process.pl
index 4da608ad345..662b70a4fee 100644
--- a/mysql-test/lib/mtr_process.pl
+++ b/mysql-test/lib/mtr_process.pl
@@ -454,8 +454,7 @@ sub mtr_kill_leftovers () {
if ( kill(0, @pids) ) # Check if some left
{
- # FIXME maybe just mtr_warning() ?
- mtr_error("can't kill process(es) " . join(" ", @pids));
+ mtr_warning("can't kill process(es) " . join(" ", @pids));
}
}
}
@@ -468,7 +467,7 @@ sub mtr_kill_leftovers () {
{
if ( mtr_ping_mysqld_server($srv->{'port'}, $srv->{'sockfile'}) )
{
- mtr_error("can't kill old mysqld holding port $srv->{'port'}");
+ mtr_warning("can't kill old mysqld holding port $srv->{'port'}");
}
}
}