From f50bf8728113cbb56dc231fd076bfdf624544913 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 31 Jan 2007 15:39:41 -0500 Subject: Bug#25341: "init.d/mysql stop" may timeout too quickly Thirty five seconds is entirely too short of a period to wait for a server to exit. Instead, make a valliant effort to make sure it exits, and only give up after a very long period (arbitrarily chosen as 15 minutes). In addition, if we're being asked to restart the server, then don't try to start again if trying to stop the server failed. --- Return zero by default, when the script exits. --- Set return-/exit-value based on whether we successfully dealt with the PID-file. --- Don't wait that long if the program we're waiting on exits. It should only exit if the server is not going to be started. support-files/mysql.server.sh: Raise timeout to a pessimistic value, 15 minutes. We should only be willing to give up and exit after an extraordinary effort. --- Return zero by default, when the script exits. --- Set return-/exit-value based on whether we successfully dealt with the PID-file. --- Don't wait that long if the program we're waiting on exits. It should only exit if the server is not going to be started. --- BitKeeper/etc/collapsed | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'BitKeeper') diff --git a/BitKeeper/etc/collapsed b/BitKeeper/etc/collapsed index 951d894c5b6..bf701e78a5c 100644 --- a/BitKeeper/etc/collapsed +++ b/BitKeeper/etc/collapsed @@ -30,3 +30,9 @@ 4554b3722d71SbPiI2Gx-RhbZjmuIQ 4558b3d73Cxjlb7Wv1oytdSTthxDfw 45771031yRCoM_ZfONdYchPvVEgLRg +459a60d8rIxeTuhB3j_QsOwLGdcpng +459a61c9OS8PzIsdviZJDkybJ1y1uA +459a70691aYIfU2ohV0a3P5iTLpO2A +459a7422KF_P7PuU3YQ5qG6ZLEVpiA +459a74e4nRcXppMSBYeQQ5efDkTADg +45c0fdfb2mz6NdOIsLenJtf6_ZelTA -- cgit v1.2.1