Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
redis
Commits
818dc3a0
Unverified
Commit
818dc3a0
authored
Jul 21, 2020
by
Madelyn Olson
Committed by
GitHub
Jul 21, 2020
Browse files
Properly reset errno for rdbLoad (#7542)
parent
36b94943
Changes
1
Show whitespace changes
Inline
Side-by-side
src/server.c
View file @
818dc3a0
...
...
@@ -4881,6 +4881,7 @@ void loadDataFromDisk(void) {
serverLog
(
LL_NOTICE
,
"DB loaded from append only file: %.3f seconds"
,(
float
)(
ustime
()
-
start
)
/
1000000
);
}
else
{
rdbSaveInfo
rsi
=
RDB_SAVE_INFO_INIT
;
errno
=
0
;
/* Prevent a stale value from affecting error checking */
if
(
rdbLoad
(
server
.
rdb_filename
,
&
rsi
,
RDBFLAGS_NONE
)
==
C_OK
)
{
serverLog
(
LL_NOTICE
,
"DB loaded from disk: %.3f seconds"
,
(
float
)(
ustime
()
-
start
)
/
1000000
);
...
...
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