Merge branch 'develop' into 1.2.1-binlog_router_trx

2015-09-21 09:03:13 +02:00 · 2015-09-21 09:03:13 +02:00 · 26b0ff8e77
commit 26b0ff8e77
parent f97df72a3e de8e54da8b
1 changed files with 2 additions and 1 deletions
--- a/server/core/gateway.c
+++ b/server/core/gateway.c
@ -2000,7 +2000,8 @@ int main(int argc, char **argv)
         * Successful start, notify the parent process that it can exit.
         */
        ss_dassert(rc == MAXSCALE_SHUTDOWN);
-        write_child_exit_code(daemon_pipe[1], rc);
+        if(daemon_mode)
+            write_child_exit_code(daemon_pipe[1], rc);

 	MaxScaleStarted = time(0);
        /*<