diff options
| author | unknown <petr@mysql.com> | 2005-02-13 15:13:33 +0300 |
|---|---|---|
| committer | unknown <petr@mysql.com> | 2005-02-13 15:13:33 +0300 |
| commit | 5bd607785a1f72b826831ab45c99d75b69846531 (patch) | |
| tree | 0416b3a77d516d448dfd5239dadc5bf9e7583bcc /server-tools/instance-manager/manager.cc | |
| parent | dce2554f9130920ab18e4e31432df7d6ca165ee0 (diff) | |
| download | mariadb-git-5bd607785a1f72b826831ab45c99d75b69846531.tar.gz | |
various fixes
server-tools/instance-manager/buffer.cc:
use my_realloc instead of realloc
server-tools/instance-manager/buffer.h:
use my_malloc instead of malloc
server-tools/instance-manager/commands.cc:
No need to send a buffer if there were some error while writing to it
server-tools/instance-manager/instance_options.cc:
cleanup
server-tools/instance-manager/manager.cc:
check sigwait return value
server-tools/instance-manager/parse_output.cc:
fixed a bug, found with valgrind
Diffstat (limited to 'server-tools/instance-manager/manager.cc')
| -rw-r--r-- | server-tools/instance-manager/manager.cc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/server-tools/instance-manager/manager.cc b/server-tools/instance-manager/manager.cc index af8dac47dca..87ad938615f 100644 --- a/server-tools/instance-manager/manager.cc +++ b/server-tools/instance-manager/manager.cc @@ -171,7 +171,14 @@ void manager(const Options &options) while (!shutdown_complete) { - sigwait(&mask, &signo); + int status= 0; + + if (status= my_sigwait(&mask, &signo)) + { + log_error("sigwait() failed"); + goto err; + } + switch (signo) { case THR_SERVER_ALARM: |