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

initial import of Windows port of IM.

Browse Source
This commit is contained in:
reggie@fedora.(none)
2005-07-20 10:55:40 -05:00
parent f40ac0bb99
commit f3de5d6b69
25 changed files with 1236 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
server-tools/instance-manager/instance_map.cc
View File

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