mirror of
https://github.com/MariaDB/server.git
synced 2026-01-06 05:22:24 +03:00
initial import of Windows port of IM.
server-tools/instance-manager/commands.cc: type cleanups for compiling on Windows now using Options::config_file for the location of the single my.cnf file we are using server-tools/instance-manager/guardian.cc: pthread_mutex_lock and unlock do not return a value on Windows so we return 0 in all cases server-tools/instance-manager/instance.cc: big changes here. Had to implement Windows versions of launch_and_wait and kill() server-tools/instance-manager/instance.h: added some function defs server-tools/instance-manager/instance_map.cc: pthread_mutex_lock and unlock do not return a value on Windows Also, now using only the file named as Options::config_file server-tools/instance-manager/instance_options.h: added reference to port.h server-tools/instance-manager/listener.cc: reworked and simplified the socket handling code. Added windows versions of the code that sets the sockets to be non-blocking and non-inheritable server-tools/instance-manager/listener.h: change Options to always be a struct. Really surprised GCC was letting this go. Options was declared to be struct in some places and class in other places. server-tools/instance-manager/log.cc: added reference to port.h server-tools/instance-manager/manager.cc: moved all the signal code inside some #ifndef __WIN__ blocks server-tools/instance-manager/manager.h: change Options to always be a struct. Really surprised GCC was letting this go. Options was declared to be struct in some places and class in other places. server-tools/instance-manager/mysqlmanager.cc: added in the Windows service code. server-tools/instance-manager/options.cc: Added in the windows options for running as a service and the code for loading settings only from a single file server-tools/instance-manager/options.h: added definitions for the new Windows service vars and routines server-tools/instance-manager/parse_output.cc: added reference to port.h server-tools/instance-manager/priv.cc: added reference to port.h server-tools/instance-manager/priv.h: linuxthreads should not be visible on Windows server-tools/instance-manager/thread_registry.cc: more __WIN__ blocking server-tools/instance-manager/user_map.cc: fixed passwd file code to handle files with \r\n line endings server-tools/instance-manager/IMService.cpp: New BitKeeper file ``server-tools/instance-manager/IMService.cpp'' server-tools/instance-manager/IMService.h: New BitKeeper file ``server-tools/instance-manager/IMService.h'' server-tools/instance-manager/WindowsService.cpp: New BitKeeper file ``server-tools/instance-manager/WindowsService.cpp'' server-tools/instance-manager/WindowsService.h: New BitKeeper file ``server-tools/instance-manager/WindowsService.h'' server-tools/instance-manager/mysqlmanager.vcproj: New BitKeeper file ``server-tools/instance-manager/mysqlmanager.vcproj'' server-tools/instance-manager/port.h: New BitKeeper file ``server-tools/instance-manager/port.h''
This commit is contained in:
@@ -22,6 +22,7 @@
|
||||
|
||||
#include "buffer.h"
|
||||
#include "instance.h"
|
||||
#include "options.h"
|
||||
|
||||
#include <m_ctype.h>
|
||||
#include <mysql_com.h>
|
||||
@@ -138,13 +139,23 @@ Instance_map::~Instance_map()
|
||||
|
||||
int Instance_map::lock()
|
||||
{
|
||||
#ifdef __WIN__
|
||||
pthread_mutex_lock(&LOCK_instance_map);
|
||||
return 0;
|
||||
#else
|
||||
return pthread_mutex_lock(&LOCK_instance_map);
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
int Instance_map::unlock()
|
||||
{
|
||||
#ifdef __WIN__
|
||||
pthread_mutex_unlock(&LOCK_instance_map);
|
||||
return 0;
|
||||
#else
|
||||
return pthread_mutex_unlock(&LOCK_instance_map);
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
@@ -245,7 +256,7 @@ int Instance_map::load()
|
||||
else
|
||||
argv_options[1]= '\0';
|
||||
|
||||
if (my_search_option_files("my", &argc, (char ***) &argv, &args_used,
|
||||
if (my_search_option_files(Options::config_file, &argc, (char ***) &argv, &args_used,
|
||||
process_option, (void*) this) ||
|
||||
complete_initialization())
|
||||
return 1;
|
||||
|
||||
Reference in New Issue
Block a user