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
70467884
Commit
70467884
authored
Jul 19, 2015
by
Kristian Nielsen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix build failures.
parent
13dbb6fa
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
0 deletions
+4
-0
sql/mysqld.cc
sql/mysqld.cc
+4
-0
No files found.
sql/mysqld.cc
View file @
70467884
...
...
@@ -1901,11 +1901,13 @@ static void __cdecl kill_server(int sig_ptr)
}
#endif
#ifdef WITH_WSREP
/* Stop wsrep threads in case they are running. */
if
(
wsrep_running_threads
>
0
)
{
wsrep_stop_replication
(
NULL
);
}
#endif
close_connections
();
...
...
@@ -5730,6 +5732,7 @@ int mysqld_main(int argc, char **argv)
}
#endif
#ifdef WITH_WSREP
// Recover and exit.
if
(
wsrep_recovery
)
{
...
...
@@ -5740,6 +5743,7 @@ int mysqld_main(int argc, char **argv)
sql_print_information
(
"WSREP: disabled, skipping position recovery"
);
unireg_abort
(
0
);
}
#endif
/*
init signals & alarm
...
...
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