mirror of
https://github.com/MariaDB/server.git
synced 2026-05-11 01:20:15 +02:00
make the IM compile on Windows
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:
parent
5ce36e8134
commit
e9af959eef
4 changed files with 7 additions and 6 deletions
|
|
@ -334,7 +334,7 @@ int Instance_options::complete_initialization(const char *default_path,
|
|||
uint instance_type)
|
||||
{
|
||||
const char *tmp;
|
||||
char* end;
|
||||
char *end;
|
||||
|
||||
if (!mysqld_path && !(mysqld_path= strdup_root(&alloc, default_path)))
|
||||
goto err;
|
||||
|
|
|
|||
|
|
@ -26,13 +26,13 @@
|
|||
|
||||
void trim_space(const char **text, uint *word_len)
|
||||
{
|
||||
const char* start= *text;
|
||||
const char *start= *text;
|
||||
while (*start != 0 && *start == ' ')
|
||||
start++;
|
||||
*text= 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))
|
||||
end--;
|
||||
*word_len= (end - start)+1;
|
||||
|
|
|
|||
|
|
@ -73,8 +73,9 @@ unsigned long open_files_limit;
|
|||
int set_stacksize_n_create_thread(pthread_t *thread, pthread_attr_t *attr,
|
||||
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
|
||||
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,
|
||||
(size_t) (PTHREAD_STACK_MIN +
|
||||
IM_THREAD_STACK_SIZE));
|
||||
|
||||
#endif
|
||||
if (!rc)
|
||||
rc= pthread_create(thread, attr, start_routine, arg);
|
||||
return rc;
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
#else
|
||||
#include <unistd.h>
|
||||
#endif
|
||||
|
||||
#include "my_pthread.h"
|
||||
|
||||
/* the pid of the manager process (of the signal thread on the LinuxThreads) */
|
||||
extern pid_t manager_pid;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue