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

Removed raw debug output when no error on OS operation has not happened.
MariaDB · Aug 13, 2014 · 2062c9a · 2062c9a
1 parent e2b2bde
commit 2062c9a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/storage/innobase/os/os0file.cc b/storage/innobase/os/os0file.cc
@@ -802,16 +802,19 @@ os_file_handle_error_cond_exit(
 		is better to ignore on_error_silent and print an error message
 		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) {
 			ib_logf(IB_LOG_LEVEL_ERROR, "File %s: '%s' returned OS "
 				"error " ULINTPF ".%s", name ? name : "(unknown)",
 				operation, err, should_exit
 				? " Cannot continue operation" : "");
 		}
 
-		fprintf(stderr,
-			" InnoDB: at file %s and at line %ld\n", file, line);
-
 		if (should_exit) {
 			exit(1);
 		}

diff --git a/storage/xtradb/os/os0file.cc b/storage/xtradb/os/os0file.cc
@@ -871,8 +871,11 @@ os_file_handle_error_cond_exit(
 		is better to ignore on_error_silent and print an error message
 		to the log. */
 
-		fprintf(stderr,
-			" InnoDB: at file %s and at line %ld\n", file, line);
+		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) {
 			ib_logf(IB_LOG_LEVEL_ERROR, "File %s: '%s' returned OS "