Commit 49d721d7 authored by unknown's avatar unknown
Browse files

Don't complain in the error log about IM shutdown unless

BUG#20761 is fixed.

parent 44a40f1d
Loading
Loading
Loading
Loading
+16 −9
Original line number Diff line number Diff line
@@ -2968,17 +2968,24 @@ sub im_stop($) {
    mtr_kill_processes(\@mysqld_pids);

    # Complain in error log so that a warning will be shown.
    # 
    # 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 $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.