cleanup, use encryption_key_id_exists() where appropriate

Author: vuvova

storage/innobase/fil/fil0fil.cc

@@ -1994,9 +1994,8 @@ fil_read_first_page(
 	if ((cdata && cdata->encryption == FIL_SPACE_ENCRYPTION_ON) ||
 		(srv_encrypt_tables &&
 			cdata && cdata->encryption == FIL_SPACE_ENCRYPTION_DEFAULT)) {
-		uint rc = encryption_key_get_latest_version(cdata->key_id);
 
-		if (rc == ENCRYPTION_KEY_VERSION_INVALID) {
+		if (!encryption_key_id_exists(cdata->key_id)) {
 			ib_logf(IB_LOG_LEVEL_FATAL,
 				"Tablespace id %ld encrypted but encryption service"
 				" not available. Can't continue opening tablespace.\n",

storage/maria/ma_crypt.c

@@ -315,8 +315,7 @@ void ma_crypt_set_data_pagecache_callbacks(PAGECACHE_FILE *file,
                                            __attribute__((unused)))
 {
   /* Only use encryption if we have defined it */
-  if (encryption_key_get_latest_version(HARD_CODED_ENCRYPTION_KEY_ID) !=
-      ENCRYPTION_KEY_VERSION_INVALID)
+  if (encryption_key_id_exists(HARD_CODED_ENCRYPTION_KEY_ID))
   {
     file->pre_read_hook= ma_crypt_pre_read_hook;
     file->post_read_hook= ma_crypt_data_post_read_hook;

storage/xtradb/fil/fil0fil.cc

@@ -2032,9 +2032,8 @@ fil_read_first_page(
 	if ((cdata && cdata->encryption == FIL_SPACE_ENCRYPTION_ON) ||
 		(srv_encrypt_tables &&
 			cdata && cdata->encryption == FIL_SPACE_ENCRYPTION_DEFAULT)) {
-		uint rc = encryption_key_get_latest_version(cdata->key_id);
 
-		if (rc == ENCRYPTION_KEY_VERSION_INVALID) {
+		if (!encryption_key_id_exists(cdata->key_id)) {
 			ib_logf(IB_LOG_LEVEL_FATAL,
 				"Tablespace id %ld encrypted but encryption service"
 				" not available. Can't continue opening tablespace.\n",