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
3589c872
Commit
3589c872
authored
14 years ago
by
Dmitry Shulga
Browse files
Options
Browse Files
Download
Plain Diff
Auto-merge from mysql-5.1-bugteam for bug#56821.
parents
b7a8979d
9516e824
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
30 additions
and
16 deletions
+30
-16
sql/log.cc
sql/log.cc
+30
-16
No files found.
sql/log.cc
View file @
3589c872
...
@@ -5456,10 +5456,32 @@ extern "C" my_bool reopen_fstreams(const char *filename,
...
@@ -5456,10 +5456,32 @@ extern "C" my_bool reopen_fstreams(const char *filename,
FILE
*
outstream
,
FILE
*
errstream
)
FILE
*
outstream
,
FILE
*
errstream
)
{
{
int
handle_fd
;
int
handle_fd
;
int
stream
_fd
;
int
err_fd
,
out
_fd
;
HANDLE
osfh
;
HANDLE
osfh
;
DBUG_ASSERT
(
filename
&&
(
outstream
||
errstream
));
DBUG_ASSERT
(
filename
&&
errstream
);
// Services don't have stdout/stderr on Windows, so _fileno returns -1.
err_fd
=
_fileno
(
errstream
);
if
(
err_fd
<
0
)
{
if
(
!
freopen
(
filename
,
"a+"
,
errstream
))
return
TRUE
;
setbuf
(
errstream
,
NULL
);
err_fd
=
_fileno
(
errstream
);
}
if
(
outstream
)
{
out_fd
=
_fileno
(
outstream
);
if
(
out_fd
<
0
)
{
if
(
!
freopen
(
filename
,
"a+"
,
outstream
))
return
TRUE
;
out_fd
=
_fileno
(
outstream
);
}
}
if
((
osfh
=
CreateFile
(
filename
,
GENERIC_READ
|
GENERIC_WRITE
,
if
((
osfh
=
CreateFile
(
filename
,
GENERIC_READ
|
GENERIC_WRITE
,
FILE_SHARE_READ
|
FILE_SHARE_WRITE
|
FILE_SHARE_READ
|
FILE_SHARE_WRITE
|
...
@@ -5475,24 +5497,16 @@ extern "C" my_bool reopen_fstreams(const char *filename,
...
@@ -5475,24 +5497,16 @@ extern "C" my_bool reopen_fstreams(const char *filename,
return
TRUE
;
return
TRUE
;
}
}
if
(
outstream
)
if
(
_dup2
(
handle_fd
,
err_fd
)
<
0
)
{
{
stream_fd
=
_fileno
(
outstream
);
CloseHandle
(
osfh
);
if
(
_dup2
(
handle_fd
,
stream_fd
)
<
0
)
return
TRUE
;
{
CloseHandle
(
osfh
);
return
TRUE
;
}
}
}
if
(
errstream
)
if
(
outstream
&&
_dup2
(
handle_fd
,
out_fd
)
<
0
)
{
{
stream_fd
=
_fileno
(
errstream
);
CloseHandle
(
osfh
);
if
(
_dup2
(
handle_fd
,
stream_fd
)
<
0
)
return
TRUE
;
{
CloseHandle
(
osfh
);
return
TRUE
;
}
}
}
_close
(
handle_fd
);
_close
(
handle_fd
);
...
...
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