diff options
| author | unknown <joerg@mysql.com> | 2006-04-07 13:58:45 +0200 |
|---|---|---|
| committer | unknown <joerg@mysql.com> | 2006-04-07 13:58:45 +0200 |
| commit | 98871cb43c3d8545a59b146927cf96379c2d62c2 (patch) | |
| tree | f13472d7e5092af6987a4012bf22d422a8339ed6 /mysql-test/lib | |
| parent | cc0e156ecc7ae7453818d4117d21aedf3f9023e8 (diff) | |
| parent | 1ba7235e10f4aefa2c2f0c2a4fe67975a4bd9cb3 (diff) | |
| download | mariadb-git-98871cb43c3d8545a59b146927cf96379c2d62c2.tar.gz | |
Null-merge, as the changes in question were backports from 5.1.
mysql-test/lib/mtr_process.pl:
Auto merged
Diffstat (limited to 'mysql-test/lib')
| -rw-r--r-- | mysql-test/lib/mtr_process.pl | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/mysql-test/lib/mtr_process.pl b/mysql-test/lib/mtr_process.pl index 86a4312e0c8..58652960e36 100644 --- a/mysql-test/lib/mtr_process.pl +++ b/mysql-test/lib/mtr_process.pl @@ -465,8 +465,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)); } } } @@ -479,7 +478,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'}"); } } } |