Post-merge fix: build error in innodb-enabled build.

knielsen · knielsen · commit 18715befd292 · 2015-04-17T19:48:55.000+02:00
diff --git a/storage/innobase/os/os0file.cc b/storage/innobase/os/os0file.cc
@@ -4913,7 +4913,8 @@ os_aio_func(
 				os_has_said_disk_full = FALSE; ret = 0; errno = 28;);
 
 			if (!ret) {
-				os_file_handle_error_cond_exit(name, "os_file_write_func", TRUE, FALSE);
+				os_file_handle_error_cond_exit(name, "os_file_write_func", TRUE, FALSE,
+							       __FILE__, __LINE__);
 			}
 		}
 
@@ -5771,7 +5772,8 @@ os_aio_simulated_handle(
 			errno = 28;);
 
 		if (!ret) {
-			os_file_handle_error_cond_exit(aio_slot->name, "os_file_write_func", TRUE, FALSE);
+			os_file_handle_error_cond_exit(aio_slot->name, "os_file_write_func", TRUE, FALSE,
+						       __FILE__, __LINE__);
 		}
 
 	} else {

Original file line number	Diff line number	Diff line change
`@@ -4913,7 +4913,8 @@ os_aio_func(`
`4913`	`4913`	`os_has_said_disk_full = FALSE; ret = 0; errno = 28;);`
`4914`	`4914`
`4915`	`4915`	`if (!ret) {`
`4916`		`- os_file_handle_error_cond_exit(name, "os_file_write_func", TRUE, FALSE);`
	`4916`	`+ os_file_handle_error_cond_exit(name, "os_file_write_func", TRUE, FALSE,`
	`4917`	`+ __FILE__, __LINE__);`
`4917`	`4918`	`}`
`4918`	`4919`	`}`
`4919`	`4920`
`@@ -5771,7 +5772,8 @@ os_aio_simulated_handle(`
`5771`	`5772`	`errno = 28;);`
`5772`	`5773`
`5773`	`5774`	`if (!ret) {`
`5774`		`- os_file_handle_error_cond_exit(aio_slot->name, "os_file_write_func", TRUE, FALSE);`
	`5775`	`+ os_file_handle_error_cond_exit(aio_slot->name, "os_file_write_func", TRUE, FALSE,`
	`5776`	`+ __FILE__, __LINE__);`
`5775`	`5777`	`}`
`5776`	`5778`
`5777`	`5779`	`} else {`