Merge pull request #352 from grooverdan/10.1-xtradb-fil_crypt_rotate_page

Jan Lindström · web-flow · commit 64a37f6cab05 · 2017-04-05T09:43:36.000+03:00
xtradb: fil_crypt_rotate_page, space_id should be compared to TRX_SYS_SPACE
diff --git a/storage/xtradb/fil/fil0crypt.cc b/storage/xtradb/fil/fil0crypt.cc
@@ -1951,7 +1951,7 @@ fil_crypt_rotate_page(
 		return;
 	}
 
-	if (space == TRX_SYS_SPACE && offset == TRX_SYS_PAGE_NO) {
+	if (space_id == TRX_SYS_SPACE && offset == TRX_SYS_PAGE_NO) {
 		/* don't encrypt this as it contains address to dblwr buffer */
 		return;
 	}

Original file line number	Diff line number	Diff line change
`@@ -1951,7 +1951,7 @@ fil_crypt_rotate_page(`
`1951`	`1951`	`return;`
`1952`	`1952`	`}`
`1953`	`1953`
`1954`		`- if (space == TRX_SYS_SPACE && offset == TRX_SYS_PAGE_NO) {`
	`1954`	`+ if (space_id == TRX_SYS_SPACE && offset == TRX_SYS_PAGE_NO) {`
`1955`	`1955`	`/* don't encrypt this as it contains address to dblwr buffer */`
`1956`	`1956`	`return;`
`1957`	`1957`	`}`