Pass down the information should we encrypt the page at os0file.cc

when page compression and google encryption is used.

1 files changed, 6 insertions, 4 deletions

diff --git a/storage/xtradb/include/os0file.ic b/storage/xtradb/include/os0file.ic
index 9ab191bd460..39599ba2047 100644
--- a/storage/xtradb/include/os0file.ic
+++ b/storage/xtradb/include/os0file.ic
@@ -222,7 +222,7 @@ pfs_os_aio_func(
 	trx_t*		trx,
 	ibool		page_compression, /*!< in: is page compression used
 					  on this file space */
-	ulint		page_compression_level, /*!< page compression
+	ulint		page_compression_level, /*!< in: page compression
 						 level to be used */
 	ulint*		write_size,/*!< in/out: Actual write size initialized
 			       after fist successfull trim
@@ -231,10 +231,12 @@ pfs_os_aio_func(
 			       actual page size does not decrease. */
 	ibool		page_encryption, /*!< in: is page encryption used
 					 on this file space */
-	ulint		page_encryption_key, /*!< page encryption
+	ulint		page_encryption_key, /*!< in: page encryption
 					     key to be used */
 
-	lsn_t		lsn,		/* lsn of the newest modification */
+	lsn_t		lsn,		/*!< in: lsn of the newest
+					modification */
+	bool		encrypt_later,  /*!< in: encrypt later ? */
 	const char*	src_file,/*!< in: file name where func invoked */
 	ulint		src_line)/*!< in: line where the func invoked */
 {
@@ -252,7 +254,7 @@ pfs_os_aio_func(
 	result = os_aio_func(type, mode, name, file, buf, offset,
 			     n, message1, message2, space_id, trx,
 			     page_compression, page_compression_level, write_size ,
-		             page_encryption, page_encryption_key, lsn);
+		             page_encryption, page_encryption_key, lsn, encrypt_later);
 
 	register_pfs_file_io_end(locker, n);