Commit 2062c9a6 authored by Jan Lindström's avatar Jan Lindström

MDEV-6567: Raw debug output in the error log.

Removed raw debug output when no error on OS operation has not happened.
parent e2b2bde3
...@@ -802,6 +802,12 @@ os_file_handle_error_cond_exit( ...@@ -802,6 +802,12 @@ os_file_handle_error_cond_exit(
is better to ignore on_error_silent and print an error message is better to ignore on_error_silent and print an error message
to the log. */ to the log. */
if (should_exit || !on_error_silent) {
fprintf(stderr,
" InnoDB: Operation %s to file %s and at line %ld\n",
operation, file, line);
}
if (should_exit || !on_error_silent) { if (should_exit || !on_error_silent) {
ib_logf(IB_LOG_LEVEL_ERROR, "File %s: '%s' returned OS " ib_logf(IB_LOG_LEVEL_ERROR, "File %s: '%s' returned OS "
"error " ULINTPF ".%s", name ? name : "(unknown)", "error " ULINTPF ".%s", name ? name : "(unknown)",
...@@ -809,9 +815,6 @@ os_file_handle_error_cond_exit( ...@@ -809,9 +815,6 @@ os_file_handle_error_cond_exit(
? " Cannot continue operation" : ""); ? " Cannot continue operation" : "");
} }
fprintf(stderr,
" InnoDB: at file %s and at line %ld\n", file, line);
if (should_exit) { if (should_exit) {
exit(1); exit(1);
} }
......
...@@ -871,8 +871,11 @@ os_file_handle_error_cond_exit( ...@@ -871,8 +871,11 @@ os_file_handle_error_cond_exit(
is better to ignore on_error_silent and print an error message is better to ignore on_error_silent and print an error message
to the log. */ to the log. */
fprintf(stderr, if (should_exit || !on_error_silent) {
" InnoDB: at file %s and at line %ld\n", file, line); fprintf(stderr,
" InnoDB: Operation %s to file %s and at line %ld\n",
operation, file, line);
}
if (should_exit || !on_error_silent) { if (should_exit || !on_error_silent) {
ib_logf(IB_LOG_LEVEL_ERROR, "File %s: '%s' returned OS " ib_logf(IB_LOG_LEVEL_ERROR, "File %s: '%s' returned OS "
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment