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

Fix compilation problems on Windows and SUN Solaris.

include/m_string.h:
  Fix declaration of C-structure for Visual Studio and Sun C-compiler.
server-tools/instance-manager/IMService.cpp:
  Fixed.
server-tools/instance-manager/Makefile.am:
  Removed gcc-specific flags.
server-tools/instance-manager/commands.cc:
  Moved m_string.h to the header.
server-tools/instance-manager/commands.h:
  Replaced forward declaration of LEX_STRING because
  it is not understood by all compilers.
server-tools/instance-manager/instance_map.cc:
  1. Moved m_string.h to the header.
  2. Use (const char *) to point to const C-string.
server-tools/instance-manager/instance_map.h:
  Replaced forward declaration of LEX_STRING because
  it is not understood by all compilers.
server-tools/instance-manager/instance_options.h:
  Fixed headers.
server-tools/instance-manager/mysqlmanager.cc:
  Fixed headers.
server-tools/instance-manager/user_management_commands.cc:
  Removed unused variables.
server-tools/instance-manager/user_map.cc:
  Fixed headers.
This commit is contained in:
unknown
2006-05-19 04:51:23 +04:00
parent 401d3a0708
commit ac3806046b
11 changed files with 19 additions and 19 deletions

View File

@ -30,15 +30,14 @@ void IMService::Run(DWORD argc, LPTSTR *argv)
// report to the SCM that we're about to start
ReportStatus((DWORD)SERVICE_START_PENDING);
Options o;
o.load(argc, argv);
Options::load(argc, argv);
// init goes here
ReportStatus((DWORD)SERVICE_RUNNING);
// wait for main loop to terminate
manager(o);
o.cleanup();
manager();
Options::cleanup();
}
void IMService::Log(const char *msg)