Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
52eb44b0
Commit
52eb44b0
authored
Nov 02, 2005
by
reggie@fedora.(none)
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
make the IM compile on Windows
parent
e3ff45d6
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
6 deletions
+7
-6
server-tools/instance-manager/instance_options.cc
server-tools/instance-manager/instance_options.cc
+1
-1
server-tools/instance-manager/parse_output.cc
server-tools/instance-manager/parse_output.cc
+2
-2
server-tools/instance-manager/priv.cc
server-tools/instance-manager/priv.cc
+3
-2
server-tools/instance-manager/priv.h
server-tools/instance-manager/priv.h
+1
-1
No files found.
server-tools/instance-manager/instance_options.cc
View file @
52eb44b0
...
...
@@ -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
;
...
...
server-tools/instance-manager/parse_output.cc
View file @
52eb44b0
...
...
@@ -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
;
...
...
server-tools/instance-manager/priv.cc
View file @
52eb44b0
...
...
@@ -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
;
...
...
server-tools/instance-manager/priv.h
View file @
52eb44b0
...
...
@@ -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
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment