From d9d072a89bcefe7685a0e9709f3937e1e161c59f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 7 Nov 2009 12:43:32 +0000
Subject: [PATCH] * Improve the mysql shutdown.

svn path=/nixos/branches/upstart-0.6/; revision=18255
---
 modules/services/databases/mysql.nix | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/modules/services/databases/mysql.nix b/modules/services/databases/mysql.nix
index 81a2c5ea007..230d36dfe91 100644
--- a/modules/services/databases/mysql.nix
+++ b/modules/services/databases/mysql.nix
@@ -89,14 +89,12 @@ in
             chown -R ${cfg.user} ${cfg.pidDir}
           '';
 
-        exec = "${mysql}/bin/mysqld ${mysqldOptions}";
+        exec = "${mysql}/libexec/mysqld ${mysqldOptions}";
 
-        postStop =
-          ''
-            pid=$(cat ${pidFile})
-            kill "$pid"
-            ${mysql}/bin/mysql_waitpid "$pid" 1000
-          '';
+        # !!! Need a postStart script to wait until mysqld is ready to
+        # accept connections.
+
+        extraConfig = "kill timeout 60";
       };
 
   };