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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
44798875
Commit
44798875
authored
19 years ago
by
jimw@mysql.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Reorder server startup so that network startup is done after storage
engine startup. (Bug #11707)
parent
9c44047f
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
12 deletions
+14
-12
sql/mysqld.cc
sql/mysqld.cc
+14
-12
No files found.
sql/mysqld.cc
View file @
44798875
...
...
@@ -1257,7 +1257,7 @@ static void set_root(const char *path)
#endif
}
static
void
server
_init
(
void
)
static
void
network
_init
(
void
)
{
struct
sockaddr_in
IPaddr
;
#ifdef HAVE_SYS_UN_H
...
...
@@ -1319,16 +1319,6 @@ static void server_init(void)
}
}
if
((
user_info
=
check_user
(
mysqld_user
)))
{
#if defined(HAVE_MLOCKALL) && defined(MCL_CURRENT)
if
(
locked_in_memory
)
// getuid() == 0 here
set_effective_user
(
user_info
);
else
#endif
set_user
(
mysqld_user
,
user_info
);
}
#ifdef __NT__
/* create named pipe */
if
(
Service
.
IsNT
()
&&
mysqld_unix_port
[
0
]
&&
!
opt_bootstrap
&&
...
...
@@ -3039,7 +3029,17 @@ int main(int argc, char **argv)
mysql_data_home
=
mysql_data_home_buff
;
mysql_data_home
[
0
]
=
FN_CURLIB
;
// all paths are relative from here
mysql_data_home
[
1
]
=
0
;
server_init
();
if
((
user_info
=
check_user
(
mysqld_user
)))
{
#if defined(HAVE_MLOCKALL) && defined(MCL_CURRENT)
if
(
locked_in_memory
)
// getuid() == 0 here
set_effective_user
(
user_info
);
else
#endif
set_user
(
mysqld_user
,
user_info
);
}
if
(
opt_bin_log
&&
!
server_id
)
{
...
...
@@ -3064,6 +3064,8 @@ we force server id to 2, but this MySQL server will not act as a slave.");
if
(
init_server_components
())
exit
(
1
);
network_init
();
#ifdef __WIN__
if
(
!
opt_console
)
{
...
...
This diff is collapsed.
Click to expand it.
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