Merge branch 'develop' into 1.2.1-binlog_router_trx

This commit is contained in:
MassimilianoPinto 2015-09-21 09:03:13 +02:00
commit 26b0ff8e77

View File

@ -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);
/*<