diff options
| author | unknown <anozdrin/alik@alik.opbmk> | 2007-02-22 22:56:43 +0300 |
|---|---|---|
| committer | unknown <anozdrin/alik@alik.opbmk> | 2007-02-22 22:56:43 +0300 |
| commit | d65f1c92ede2dfc3be9fc777d87e210fb523ae26 (patch) | |
| tree | 9abd83ce27d0133887976b57555f9b8f7b966753 /server-tools/instance-manager/manager.cc | |
| parent | 1b0a3baab2be5b64a8e794bc6f4f199c966f9c95 (diff) | |
| download | mariadb-git-d65f1c92ede2dfc3be9fc777d87e210fb523ae26.tar.gz | |
Merge fix.
Diffstat (limited to 'server-tools/instance-manager/manager.cc')
| -rw-r--r-- | server-tools/instance-manager/manager.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/server-tools/instance-manager/manager.cc b/server-tools/instance-manager/manager.cc index bde685d7a28..792461e41a9 100644 --- a/server-tools/instance-manager/manager.cc +++ b/server-tools/instance-manager/manager.cc @@ -246,7 +246,8 @@ bool Manager::init_user_map(User_map *user_map) See also comments in mysqlmanager.cc to picture general Instance Manager architecture. - TODO: how about returning error status. + RETURNS + main() returns exit status (exit code). */ int Manager::main() @@ -452,6 +453,7 @@ err: /* free alarm structures */ end_thr_alarm(1); #endif + return thread_registry.get_error_status() ? 1 : 0; } |