database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

some more cleanups and fixes

Browse Source 
server-tools/instance-manager/commands.cc:
  typo fixed
server-tools/instance-manager/instance.cc:
  moved options.complete_initialization to the instance::complete_initialization
server-tools/instance-manager/instance.h:
  moved options.complete_initialization to the Instance::complete_initialization
server-tools/instance-manager/instance_map.cc:
  moved options.complete_initialization to the Instance::complete_initialization, added code to create
  default instance if none is given iin config. file
server-tools/instance-manager/instance_map.h:
  complete_initialization now returns an error in case of a problem
server-tools/instance-manager/instance_options.cc:
  some error handling added
server-tools/instance-manager/instance_options.h:
  error handling added
server-tools/instance-manager/manager.cc:
  error handling added
server-tools/instance-manager/mysqlmanager.cc:
  stop mysqlmanager if options were not loaded correctly
server-tools/instance-manager/options.cc:
  return-value added
server-tools/instance-manager/options.h:
  return-value added to the OPtions::load()
server-tools/instance-manager/parse_output.cc:
  no need to examine mysqld --help -v termination status
This commit is contained in:
unknown
2005-02-15 04:38:33 +03:00
parent 5bd607785a
commit deba12cd34
12 changed files with 77 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server-tools/instance-manager/mysqlmanager.cc
View File

@ -74,7 +74,8 @@ int main(int argc, char *argv[])
Options options;
struct passwd *user_info;
options.load(argc, argv);
if (options.load(argc, argv))
goto err;
if ((user_info= check_user(options.user)))
{
@ -96,6 +97,9 @@ int main(int argc, char *argv[])
options.cleanup();
my_end(0);
return 0;
err:
my_end(0);
return 1;
}
/******************* Auxilary functions implementation **********************/