Followup patch of TDE wls to fix valgrind failure and windows failure.

Author: Allen Lai

mysql-test/suite/innodb/r/table_encrypt_1.result

@@ -3,7 +3,7 @@ call mtr.add_suppression("\\[ERROR\\] InnoDB: Failed to find tablespace for tabl
 call mtr.add_suppression("\\[ERROR\\] InnoDB: Operating system error number 2 in a file operation.");
 call mtr.add_suppression("\\[ERROR\\] InnoDB: The error means the system cannot find the path specified.");
 call mtr.add_suppression("\\[ERROR\\] InnoDB: Could not find a valid tablespace file for");
-call mtr.add_suppression("\\[ERROR\\] InnoDB: Encryption information in datafile: .*\.ibd can't be decrypted , please confirm the keyfile is match and keyring plugin is loaded.");
+call mtr.add_suppression("ibd can't be decrypted , please confirm the keyfile is match and keyring plugin is loaded.");
 call mtr.add_suppression("\\[Warning\\] InnoDB: Ignoring tablespace .* because it could not be opened");
 call mtr.add_suppression("\\[ERROR\\] InnoDB: If you are installing InnoDB, remember that you must create directories yourself, InnoDB does not create them.");
 CREATE TABLE t1(c1 INT, c2 char(20)) ENCRYPTION="Y" ENGINE = InnoDB;

mysql-test/suite/innodb/t/table_encrypt_1.test

@@ -14,7 +14,7 @@ call mtr.add_suppression("\\[ERROR\\] InnoDB: Failed to find tablespace for tabl
 call mtr.add_suppression("\\[ERROR\\] InnoDB: Operating system error number 2 in a file operation.");
 call mtr.add_suppression("\\[ERROR\\] InnoDB: The error means the system cannot find the path specified.");
 call mtr.add_suppression("\\[ERROR\\] InnoDB: Could not find a valid tablespace file for");
-call mtr.add_suppression("\\[ERROR\\] InnoDB: Encryption information in datafile: .*\.ibd can't be decrypted , please confirm the keyfile is match and keyring plugin is loaded.");
+call mtr.add_suppression("ibd can't be decrypted , please confirm the keyfile is match and keyring plugin is loaded.");
 call mtr.add_suppression("\\[Warning\\] InnoDB: Ignoring tablespace .* because it could not be opened");
 call mtr.add_suppression("\\[ERROR\\] InnoDB: If you are installing InnoDB, remember that you must create directories yourself, InnoDB does not create them.");
 --error ER_CANNOT_FIND_KEY_IN_KEYRING

plugin/keyring/keyring.h

@@ -35,7 +35,7 @@ extern mysql_rwlock_t LOCK_keyring;
 extern unique_ptr<IKeys_container> keys;
 extern my_bool is_keys_container_initialized;
 extern unique_ptr<ILogger> logger;
-extern unique_ptr<char> keyring_file_data;
+extern unique_ptr<char[]> keyring_file_data;
 
 #ifdef HAVE_PSI_INTERFACE
 void keyring_init_psi_keys(void);

plugin/keyring/keyring_impl.cc

@@ -27,7 +27,7 @@ mysql_rwlock_t LOCK_keyring;
 unique_ptr<IKeys_container> keys;
 my_bool is_keys_container_initialized= FALSE;
 unique_ptr<ILogger> logger;
-unique_ptr<char> keyring_file_data;
+unique_ptr<char[]> keyring_file_data;
 
 #ifdef HAVE_PSI_INTERFACE
 static PSI_rwlock_info all_keyring_rwlocks[]=

storage/innobase/fsp/fsp0fsp.cc

@@ -904,6 +904,7 @@ fsp_header_fill_encryption_info(
 		return(false);
 	}
 
+	memset(encrypt_info, 0, ENCRYPTION_INFO_SIZE);
 	/* Use the new master key to encrypt the tablespace
 	key. */
 	ut_ad(encrypt_info != NULL);

storage/innobase/handler/ha_innodb.cc

@@ -10036,6 +10036,7 @@ create_table_info_t::create_table_def()
 
 			my_error(ER_TABLESPACE_CANNOT_ENCRYPT, MYF(0));
 			err = DB_UNSUPPORTED;
+			dict_mem_table_free(table);
 
 		} else if (!Encryption::is_none(encrypt)) {
 			/* Set the encryption flag. */
@@ -10050,6 +10051,7 @@ create_table_info_t::create_table_def()
 				my_error(ER_CANNOT_FIND_KEY_IN_KEYRING,
 					 MYF(0));
 				err = DB_UNSUPPORTED;
+				dict_mem_table_free(table);
 			} else {
 				my_free(master_key);
 				DICT_TF2_FLAG_SET(table,