diff options
author | unknown <anozdrin/alik@booka.> | 2006-07-27 15:19:13 +0400 |
---|---|---|
committer | unknown <anozdrin/alik@booka.> | 2006-07-27 15:19:13 +0400 |
commit | 49d721d7cff6f613ab3a87fe3065edf16b7288ea (patch) | |
tree | b5bb1802ffe61b74afa2b8e5e4bc813b2d221add /mysql-test/mysql-test-run.pl | |
parent | 44a40f1dd4ea8ea2dbf12fd7fd851948a659aef0 (diff) | |
download | mariadb-git-49d721d7cff6f613ab3a87fe3065edf16b7288ea.tar.gz |
Don't complain in the error log about IM shutdown unless
BUG#20761 is fixed.
Diffstat (limited to 'mysql-test/mysql-test-run.pl')
-rwxr-xr-x | mysql-test/mysql-test-run.pl | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 5a7609a55fb..8b832c390f8 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -2968,17 +2968,24 @@ sub im_stop($) { mtr_kill_processes(\@mysqld_pids); # Complain in error log so that a warning will be shown. - - my $errlog= "$opt_vardir/log/mysql-test-run.pl.err"; - - open (ERRLOG, ">>$errlog") || - mtr_error("Can not open error log ($errlog)"); + # + # TODO: unless BUG#20761 is fixed, we will print the warning + # to stdout, so that it can be seen on console and does not + # produce pushbuild error. + + # my $errlog= "$opt_vardir/log/mysql-test-run.pl.err"; + # + # open (ERRLOG, ">>$errlog") || + # mtr_error("Can not open error log ($errlog)"); + # + # my $ts= localtime(); + # print ERRLOG + # "Warning: [$ts] Instance Manager did not shutdown gracefully.\n"; + # + # close ERRLOG; my $ts= localtime(); - print ERRLOG - "Warning: [$ts] Instance Manager did not shutdown gracefully.\n"; - - close ERRLOG; + print "Warning: [$ts] Instance Manager did not shutdown gracefully.\n"; } # That's all. |