[Commits] 7a2a380f536: Fix test failures seen on Windows.

jan jan.lindstrom at mariadb.com
Mon Aug 7 08:34:38 EEST 2017


revision-id: 7a2a380f5365562104787c99188b02032ab48f82 (mariadb-10.1.25-19-g7a2a380f536)
parent(s): a6189fd8f0d8c222446e7304d2617c4a305f87a1
author: Jan Lindström
committer: Jan Lindström
timestamp: 2017-08-07 08:34:29 +0300
message:

Fix test failures seen on Windows.

---
 extra/innochecksum.cc                              |  8 +++---
 .../suite/innodb/r/innodb_zip_innochecksum3.result | 32 +++++++++++-----------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/extra/innochecksum.cc b/extra/innochecksum.cc
index 77a91ead64b..83ab4933f52 100644
--- a/extra/innochecksum.cc
+++ b/extra/innochecksum.cc
@@ -106,7 +106,7 @@ bool				strict_verify = 0;
 /* Enabled for rewrite checksum. */
 static bool			do_write;
 /* Mismatches count allowed (0 by default). */
-static ulint     		allow_mismatches;
+static ulint     		allow_mismatches=0;
 static bool			page_type_summary;
 static bool			page_type_dump;
 /* Store filename for page-type-dump option. */
@@ -473,7 +473,7 @@ is_page_corrupted(
 	ulint logseq;
 	ulint logseqfield;
 	ulint page_type = mach_read_from_2(buf+FIL_PAGE_TYPE);
-	ulint key_version = mach_read_from_4(buf+FIL_PAGE_FILE_FLUSH_LSN_OR_KEY_VERSION);
+	uint key_version = mach_read_from_4(buf+FIL_PAGE_FILE_FLUSH_LSN_OR_KEY_VERSION);
 	ulint space_id = mach_read_from_4(
 		buf + FIL_PAGE_ARCH_LOG_NO_OR_SPACE_ID);
 
@@ -802,7 +802,7 @@ parse_page(
 	switch (mach_read_from_2(page + FIL_PAGE_TYPE)) {
 
 	case FIL_PAGE_INDEX: {
-		ulint key_version = mach_read_from_4(page + FIL_PAGE_FILE_FLUSH_LSN_OR_KEY_VERSION);
+		uint key_version = mach_read_from_4(page + FIL_PAGE_FILE_FLUSH_LSN_OR_KEY_VERSION);
 		page_type.n_fil_page_index++;
 
 		/* If page is encrypted we can't read index header */
@@ -891,7 +891,7 @@ parse_page(
 			}
 		} else {
 			fprintf(file, "#::" ULINTPF "\t\t|\t\tEncrypted Index page\t\t\t|"
-				"\tkey_version,%s\n", cur_page_num, key_version, str);
+				"\tkey_version %u,%s\n", cur_page_num, key_version, str);
 		}
 
 		break;
diff --git a/mysql-test/suite/innodb/r/innodb_zip_innochecksum3.result b/mysql-test/suite/innodb/r/innodb_zip_innochecksum3.result
index 9ff3d89cda1..03e8b5df75f 100644
--- a/mysql-test/suite/innodb/r/innodb_zip_innochecksum3.result
+++ b/mysql-test/suite/innodb/r/innodb_zip_innochecksum3.result
@@ -163,14 +163,14 @@ Filename::tab#.ibd
 ==============================================================================
 	PAGE_NO		|		PAGE_TYPE			|	EXTRA INFO
 ==============================================================================
-#::       #		|		File Space Header		|	-
-#::       #		|		Insert Buffer Bitmap		|	-
-#::       #		|		Inode page			|	-
-#::       #		|		Index page			|	index id=#, page level=#, No. of records=#, garbage=#, -
-#::       #		|		Index page			|	index id=#, page level=#, No. of records=#, garbage=#, -
-#::       #		|		Index page			|	index id=#, page level=#, No. of records=#, garbage=#, -
-#::       #		|		Freshly allocated page		|	-
-#::       #		|		Freshly allocated page		|	-
+#::#		|		File Space Header		|	-
+#::#		|		Insert Buffer Bitmap		|	-
+#::#		|		Inode page			|	-
+#::#		|		Index page			|	index id=#, page level=#, No. of records=#, garbage=#, -
+#::#		|		Index page			|	index id=#, page level=#, No. of records=#, garbage=#, -
+#::#		|		Index page			|	index id=#, page level=#, No. of records=#, garbage=#, -
+#::#		|		Freshly allocated page		|	-
+#::#		|		Freshly allocated page		|	-
 # Variables used by page type dump for ibdata1
 
 Variables (--variable-name=value)
@@ -198,14 +198,14 @@ Filename::tab#.ibd
 ==============================================================================
 	PAGE_NO		|		PAGE_TYPE			|	EXTRA INFO
 ==============================================================================
-#::       #		|		File Space Header		|	-
-#::       #		|		Insert Buffer Bitmap		|	-
-#::       #		|		Inode page			|	-
-#::       #		|		Index page			|	index id=#, page level=#, No. of records=#, garbage=#, -
-#::       #		|		Index page			|	index id=#, page level=#, No. of records=#, garbage=#, -
-#::       #		|		Index page			|	index id=#, page level=#, No. of records=#, garbage=#, -
-#::       #		|		Freshly allocated page		|	-
-#::       #		|		Freshly allocated page		|	-
+#::#		|		File Space Header		|	-
+#::#		|		Insert Buffer Bitmap		|	-
+#::#		|		Inode page			|	-
+#::#		|		Index page			|	index id=#, page level=#, No. of records=#, garbage=#, -
+#::#		|		Index page			|	index id=#, page level=#, No. of records=#, garbage=#, -
+#::#		|		Index page			|	index id=#, page level=#, No. of records=#, garbage=#, -
+#::#		|		Freshly allocated page		|	-
+#::#		|		Freshly allocated page		|	-
 [6]: check the valid lower bound values for option
 # allow-mismatches,page,start-page,end-page
 [9]: check the both short and long options "page" and "start-page" when


More information about the commits mailing list