Commit 52eb44b0 authored by reggie@fedora.(none)'s avatar reggie@fedora.(none)

make the IM compile on Windows

parent e3ff45d6
...@@ -334,7 +334,7 @@ int Instance_options::complete_initialization(const char *default_path, ...@@ -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;
......
...@@ -26,13 +26,13 @@ ...@@ -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;
......
...@@ -73,8 +73,9 @@ unsigned long open_files_limit; ...@@ -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, ...@@ -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;
......
...@@ -22,7 +22,7 @@ ...@@ -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;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment