summaryrefslogtreecommitdiff
path: root/BitKeeper
diff options
context:
space:
mode:
authorcmiller@zippy.cornsilk.net <>2007-01-31 15:39:41 -0500
committercmiller@zippy.cornsilk.net <>2007-01-31 15:39:41 -0500
commit24e3508b0e3d1ca10a5a8e9db102a506371ebb1c (patch)
treef89f7fedf134d3166e88bb6fdfcd257a6290e0e9 /BitKeeper
parent828121bd6d3e2fc3fbbde554fbf5182517698bb8 (diff)
downloadmariadb-git-24e3508b0e3d1ca10a5a8e9db102a506371ebb1c.tar.gz
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.
Diffstat (limited to 'BitKeeper')
-rw-r--r--BitKeeper/etc/collapsed6
1 files changed, 6 insertions, 0 deletions
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