Merge 10.6 into 10.7

1 files changed, 12 insertions, 0 deletions

diff --git a/extra/innochecksum.cc b/extra/innochecksum.cc
index 164e3c22348..82b88f7072d 100644
--- a/extra/innochecksum.cc
+++ b/extra/innochecksum.cc
@@ -1785,6 +1785,18 @@ unexpected_eof:
 			}
 
 			if (ferror(fil_in)) {
+#ifdef _AIX
+				/*
+				  AIX fseeko can go past eof without error.
+				  the error occurs on read, hence output the
+				  same error here as would show up on other
+				  platforms. This shows up in the mtr test
+				  innodb_zip.innochecksum_3-4k,crc32,innodb
+				*/
+				if (errno == EFBIG) {
+					goto unexpected_eof;
+				}
+#endif
 				fprintf(stderr, "Error reading " ULINTPF " bytes",
 					physical_page_size);
 				perror(" ");