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
5670a3f3
Commit
5670a3f3
authored
Jun 15, 2005
by
georg@lmy002.wdf.sap.corp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix for bug #11174 (can't determine hostname under Windows 64-bit)
parent
1de6c26e
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
13 deletions
+13
-13
sql/mysqld.cc
sql/mysqld.cc
+13
-13
No files found.
sql/mysqld.cc
View file @
5670a3f3
...
...
@@ -1276,19 +1276,6 @@ static void server_init(void)
int
arg
=
1
;
DBUG_ENTER
(
"server_init"
);
#ifdef __WIN__
if
(
!
opt_disable_networking
)
{
WSADATA
WsaData
;
if
(
SOCKET_ERROR
==
WSAStartup
(
0x0101
,
&
WsaData
))
{
/* errors are not read yet, so we use test here */
my_message
(
ER_WSAS_FAILED
,
"WSAStartup Failed"
,
MYF
(
0
));
unireg_abort
(
1
);
}
}
#endif
/* __WIN__ */
set_ports
();
if
(
mysqld_port
!=
0
&&
!
opt_disable_networking
&&
!
opt_bootstrap
)
...
...
@@ -3015,6 +3002,19 @@ int main(int argc, char **argv)
}
#endif
#ifdef __WIN__
if
(
!
opt_disable_networking
)
{
WSADATA
WsaData
;
if
(
SOCKET_ERROR
==
WSAStartup
(
0x0101
,
&
WsaData
))
{
/* errors are not read yet, so we use test here */
my_message
(
ER_WSAS_FAILED
,
"WSAStartup Failed"
,
MYF
(
0
));
unireg_abort
(
1
);
}
}
#endif
/* __WIN__ */
if
(
init_common_variables
(
MYSQL_CONFIG_NAME
,
argc
,
argv
,
load_default_groups
))
unireg_abort
(
1
);
// Will do exit
...
...
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