1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00

Merge fix.

This commit is contained in:
anozdrin/alik@alik.opbmk
2007-02-22 22:56:43 +03:00
parent 8a7f5ce30d
commit 100c19c01f
2 changed files with 11 additions and 8 deletions

View File

@ -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;
}