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

make the IM compile on Windows

Browse Source 
server-tools/instance-manager/instance_options.cc:
  fix for coding guidelines
server-tools/instance-manager/parse_output.cc:
  fix for coding guidelines
server-tools/instance-manager/priv.cc:
  don't call pthread_attr_setstacksize on Windows
server-tools/instance-manager/priv.h:
  include my_pthread so the thread functions will compile on Windows
This commit is contained in:
unknown
2005-11-02 09:30:01 -06:00
parent 5ce36e8134
commit e9af959eef
4 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server-tools/instance-manager/instance_options.cc
View File

@ -334,7 +334,7 @@ int Instance_options::complete_initialization(const char *default_path,
uint instance_type) uint instance_type)
{ {
const char *tmp; const char *tmp;
char* end; char *end;
if (!mysqld_path && !(mysqld_path= strdup_root(&alloc, default_path))) if (!mysqld_path && !(mysqld_path= strdup_root(&alloc, default_path)))
goto err; goto err;

4
server-tools/instance-manager/parse_output.cc
View File

@ -26,13 +26,13 @@
void trim_space(const char **text, uint *word_len) void trim_space(const char **text, uint *word_len)
{ {
const char* start= *text; const char *start= *text;
while (*start != 0 && *start == ' ') while (*start != 0 && *start == ' ')
start++; start++;
*text= start; *text= start;
int len= strlen(start); int len= strlen(start);
const char* end= start + len - 1; const char *end= start + len - 1;
while (end > start && my_isspace(&my_charset_latin1, *end)) while (end > start && my_isspace(&my_charset_latin1, *end))
end--; end--;
*word_len= (end - start)+1; *word_len= (end - start)+1;

5
server-tools/instance-manager/priv.cc
View File

@ -73,8 +73,9 @@ unsigned long open_files_limit;
int set_stacksize_n_create_thread(pthread_t *thread, pthread_attr_t *attr, int set_stacksize_n_create_thread(pthread_t *thread, pthread_attr_t *attr,
void *(*start_routine)(void *), void *arg) void *(*start_routine)(void *), void *arg)
{ {
int rc; int rc= 0;
#ifndef __WIN__
/* /*
Set stack size to be safe on the platforms with too small Set stack size to be safe on the platforms with too small
default thread stack. default thread stack.
@ -82,7 +83,7 @@ int set_stacksize_n_create_thread(pthread_t *thread, pthread_attr_t *attr,
rc= pthread_attr_setstacksize(attr, rc= pthread_attr_setstacksize(attr,
(size_t) (PTHREAD_STACK_MIN + (size_t) (PTHREAD_STACK_MIN +
IM_THREAD_STACK_SIZE)); IM_THREAD_STACK_SIZE));
#endif
if (!rc) if (!rc)
rc= pthread_create(thread, attr, start_routine, arg); rc= pthread_create(thread, attr, start_routine, arg);
return rc; return rc;

2
server-tools/instance-manager/priv.h
View File

@ -22,7 +22,7 @@
#else #else
#include <unistd.h> #include <unistd.h>
#endif #endif
#include "my_pthread.h"
/* the pid of the manager process (of the signal thread on the LinuxThreads) */ /* the pid of the manager process (of the signal thread on the LinuxThreads) */
extern pid_t manager_pid; extern pid_t manager_pid;