diff options
author | unknown <reggie@ubuntu.(none)> | 2005-09-13 14:53:19 -0500 |
---|---|---|
committer | unknown <reggie@ubuntu.(none)> | 2005-09-13 14:53:19 -0500 |
commit | c6dfe79beba3a4c03468d6e45aface45dfc38967 (patch) | |
tree | 9526667b98692215b3c525821064ff5229e93cd8 /server-tools/instance-manager/mysqlmanager.cc | |
parent | 69b1940eefad9f9badbce78104a0fdc4780a05eb (diff) | |
download | mariadb-git-c6dfe79beba3a4c03468d6e45aface45dfc38967.tar.gz |
fixed the service bits of the IM
server-tools/instance-manager/IMService.cpp:
* setting username and password to NULL so that the
IM runs at LocalSystem (this should be changed soon)
* implemented stop service by raising a sigterm
* implemented start service by loading options and calling manager()
server-tools/instance-manager/IMService.h:
changed the sig for Run()
server-tools/instance-manager/WindowsService.cpp:
default debugging to false
changed the sig of RuN()
server-tools/instance-manager/WindowsService.h:
change the sig of run()
server-tools/instance-manager/instance.cc:
* remove the inclusion of process.h
* concat all args into a single buffer to pass to CreateProcess
server-tools/instance-manager/instance_options.cc:
quoting the binary to handle paths with quotes
server-tools/instance-manager/listener.cc:
use a timeval for select so that our select will only run
for 100 msec before we check to see if we are shutting down
server-tools/instance-manager/mysqlmanager.cc:
if we are given the stand alone option, then run the manager as
standalone
server-tools/instance-manager/options.cc:
Added stand alone command line arg
server-tools/instance-manager/options.h:
Added stand alone command line arg
Diffstat (limited to 'server-tools/instance-manager/mysqlmanager.cc')
-rw-r--r-- | server-tools/instance-manager/mysqlmanager.cc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/server-tools/instance-manager/mysqlmanager.cc b/server-tools/instance-manager/mysqlmanager.cc index a1420a639cb..3d2907f4776 100644 --- a/server-tools/instance-manager/mysqlmanager.cc +++ b/server-tools/instance-manager/mysqlmanager.cc @@ -102,10 +102,12 @@ int main(int argc, char *argv[]) angel(options); } #else -#ifdef NDEBUG - return_value= HandleServiceOptions(options); - goto err; /* this is not always an error but we reuse the label */ -#endif + if (!options.stand_alone) + { + if (HandleServiceOptions(options)) + goto err; + } + else #endif manager(options); |