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
5605117d
Commit
5605117d
authored
Aug 19, 2005
by
petr@mysql.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix for BUG#10957 "stop instance, issued after flush instances causes IM to crash"
Recommited with post-review fixes
parent
41c93e36
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
241 additions
and
101 deletions
+241
-101
server-tools/instance-manager/instance.cc
server-tools/instance-manager/instance.cc
+237
-99
server-tools/instance-manager/instance.h
server-tools/instance-manager/instance.h
+2
-2
server-tools/instance-manager/instance_options.cc
server-tools/instance-manager/instance_options.cc
+2
-0
No files found.
server-tools/instance-manager/instance.cc
View file @
5605117d
This diff is collapsed.
Click to expand it.
server-tools/instance-manager/instance.h
View file @
5605117d
...
...
@@ -41,7 +41,8 @@ public:
/* send a signal to the instance */
void
kill_instance
(
int
signo
);
int
is_crashed
();
void
fork_and_monitor
();
void
set_crash_flag_n_wake_all
();
Instance_map
*
Instance
::
get_map
();
public:
enum
{
DEFAULT_SHUTDOWN_DELAY
=
35
};
...
...
@@ -63,7 +64,6 @@ private:
Instance_map
*
instance_map
;
void
remove_pid
();
int
launch_and_wait
();
};
#endif
/* INCLUDES_MYSQL_INSTANCE_MANAGER_INSTANCE_H */
server-tools/instance-manager/instance_options.cc
View file @
5605117d
...
...
@@ -130,6 +130,8 @@ int Instance_options::fill_instance_version()
version_option
,
sizeof
(
version_option
)))
goto
err
;
bzero
(
result
,
MAX_VERSION_STRING_LENGTH
);
rc
=
parse_output_and_get_value
(
cmd
.
buffer
,
mysqld_path
,
result
,
MAX_VERSION_STRING_LENGTH
,
GET_LINE
);
...
...
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