Skip to content

Commit 2062c9a

Browse files
author
Jan Lindström
committed
MDEV-6567: Raw debug output in the error log.
Removed raw debug output when no error on OS operation has not happened.
1 parent e2b2bde commit 2062c9a

File tree

2 files changed

+11
-5
lines changed

2 files changed

+11
-5
lines changed

storage/innobase/os/os0file.cc

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -802,16 +802,19 @@ os_file_handle_error_cond_exit(
802802
is better to ignore on_error_silent and print an error message
803803
to the log. */
804804

805+
if (should_exit || !on_error_silent) {
806+
fprintf(stderr,
807+
" InnoDB: Operation %s to file %s and at line %ld\n",
808+
operation, file, line);
809+
}
810+
805811
if (should_exit || !on_error_silent) {
806812
ib_logf(IB_LOG_LEVEL_ERROR, "File %s: '%s' returned OS "
807813
"error " ULINTPF ".%s", name ? name : "(unknown)",
808814
operation, err, should_exit
809815
? " Cannot continue operation" : "");
810816
}
811817

812-
fprintf(stderr,
813-
" InnoDB: at file %s and at line %ld\n", file, line);
814-
815818
if (should_exit) {
816819
exit(1);
817820
}

storage/xtradb/os/os0file.cc

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -871,8 +871,11 @@ os_file_handle_error_cond_exit(
871871
is better to ignore on_error_silent and print an error message
872872
to the log. */
873873

874-
fprintf(stderr,
875-
" InnoDB: at file %s and at line %ld\n", file, line);
874+
if (should_exit || !on_error_silent) {
875+
fprintf(stderr,
876+
" InnoDB: Operation %s to file %s and at line %ld\n",
877+
operation, file, line);
878+
}
876879

877880
if (should_exit || !on_error_silent) {
878881
ib_logf(IB_LOG_LEVEL_ERROR, "File %s: '%s' returned OS "

0 commit comments

Comments
 (0)