MDEV-22103 INNODB_ENCRYPTION_NUM_KEY_REQUESTS is missing from INFORMATION_SCHEMA.GLOBAL_STATUS

In commit a5584b13
some scrubbing-related status variables were removed along with
the background scrubbing code.
The status variable INNODB_ENCRYPTION_NUM_KEY_REQUESTS
was inadvertently removed as part of that.

innodb_status_variables[]: Restore "encryption_num_key_requests".

We introduce the test innodb.innodb_status_variables
in order to catch similar regressions in the future.

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

+SELECT variable_name FROM information_schema.global_status
+WHERE variable_name LIKE 'INNODB_%'
+AND variable_name NOT IN
+('INNODB_ADAPTIVE_HASH_HASH_SEARCHES','INNODB_ADAPTIVE_HASH_NON_HASH_SEARCHES',
+'INNODB_MEM_ADAPTIVE_HASH',
+'INNODB_BUFFERED_AIO_SUBMITTED','INNODB_BUFFER_POOL_PAGES_LATCHED');
+variable_name
+INNODB_BACKGROUND_LOG_SYNC
+INNODB_BUFFER_POOL_DUMP_STATUS
+INNODB_BUFFER_POOL_LOAD_STATUS
+INNODB_BUFFER_POOL_RESIZE_STATUS
+INNODB_BUFFER_POOL_LOAD_INCOMPLETE
+INNODB_BUFFER_POOL_PAGES_DATA
+INNODB_BUFFER_POOL_BYTES_DATA
+INNODB_BUFFER_POOL_PAGES_DIRTY
+INNODB_BUFFER_POOL_BYTES_DIRTY
+INNODB_BUFFER_POOL_PAGES_FLUSHED
+INNODB_BUFFER_POOL_PAGES_FREE
+INNODB_BUFFER_POOL_PAGES_MADE_NOT_YOUNG
+INNODB_BUFFER_POOL_PAGES_MADE_YOUNG
+INNODB_BUFFER_POOL_PAGES_MISC
+INNODB_BUFFER_POOL_PAGES_OLD
+INNODB_BUFFER_POOL_PAGES_TOTAL
+INNODB_BUFFER_POOL_PAGES_LRU_FLUSHED
+INNODB_BUFFER_POOL_READ_AHEAD_RND
+INNODB_BUFFER_POOL_READ_AHEAD
+INNODB_BUFFER_POOL_READ_AHEAD_EVICTED
+INNODB_BUFFER_POOL_READ_REQUESTS
+INNODB_BUFFER_POOL_READS
+INNODB_BUFFER_POOL_WAIT_FREE
+INNODB_BUFFER_POOL_WRITE_REQUESTS
+INNODB_CHECKPOINT_AGE
+INNODB_CHECKPOINT_MAX_AGE
+INNODB_DATA_FSYNCS
+INNODB_DATA_PENDING_FSYNCS
+INNODB_DATA_PENDING_READS
+INNODB_DATA_PENDING_WRITES
+INNODB_DATA_READ
+INNODB_DATA_READS
+INNODB_DATA_WRITES
+INNODB_DATA_WRITTEN
+INNODB_DBLWR_PAGES_WRITTEN
+INNODB_DBLWR_WRITES
+INNODB_DEADLOCKS
+INNODB_HISTORY_LIST_LENGTH
+INNODB_IBUF_DISCARDED_DELETE_MARKS
+INNODB_IBUF_DISCARDED_DELETES
+INNODB_IBUF_DISCARDED_INSERTS
+INNODB_IBUF_FREE_LIST
+INNODB_IBUF_MERGED_DELETE_MARKS
+INNODB_IBUF_MERGED_DELETES
+INNODB_IBUF_MERGED_INSERTS
+INNODB_IBUF_MERGES
+INNODB_IBUF_SEGMENT_SIZE
+INNODB_IBUF_SIZE
+INNODB_LOG_WAITS
+INNODB_LOG_WRITE_REQUESTS
+INNODB_LOG_WRITES
+INNODB_LSN_CURRENT
+INNODB_LSN_FLUSHED
+INNODB_LSN_LAST_CHECKPOINT
+INNODB_MASTER_THREAD_ACTIVE_LOOPS
+INNODB_MASTER_THREAD_IDLE_LOOPS
+INNODB_MAX_TRX_ID
+INNODB_MEM_DICTIONARY
+INNODB_OS_LOG_FSYNCS
+INNODB_OS_LOG_PENDING_FSYNCS
+INNODB_OS_LOG_PENDING_WRITES
+INNODB_OS_LOG_WRITTEN
+INNODB_PAGE_SIZE
+INNODB_PAGES_CREATED
+INNODB_PAGES_READ
+INNODB_PAGES_WRITTEN
+INNODB_ROW_LOCK_CURRENT_WAITS
+INNODB_ROW_LOCK_TIME
+INNODB_ROW_LOCK_TIME_AVG
+INNODB_ROW_LOCK_TIME_MAX
+INNODB_ROW_LOCK_WAITS
+INNODB_ROWS_DELETED
+INNODB_ROWS_INSERTED
+INNODB_ROWS_READ
+INNODB_ROWS_UPDATED
+INNODB_SYSTEM_ROWS_DELETED
+INNODB_SYSTEM_ROWS_INSERTED
+INNODB_SYSTEM_ROWS_READ
+INNODB_SYSTEM_ROWS_UPDATED
+INNODB_NUM_OPEN_FILES
+INNODB_TRUNCATED_STATUS_WRITES
+INNODB_AVAILABLE_UNDO_LOGS
+INNODB_UNDO_TRUNCATIONS
+INNODB_PAGE_COMPRESSION_SAVED
+INNODB_NUM_INDEX_PAGES_WRITTEN
+INNODB_NUM_NON_INDEX_PAGES_WRITTEN
+INNODB_NUM_PAGES_PAGE_COMPRESSED
+INNODB_NUM_PAGE_COMPRESSED_TRIM_OP
+INNODB_NUM_PAGES_PAGE_DECOMPRESSED
+INNODB_NUM_PAGES_PAGE_COMPRESSION_ERROR
+INNODB_NUM_PAGES_ENCRYPTED
+INNODB_NUM_PAGES_DECRYPTED
+INNODB_HAVE_LZ4
+INNODB_HAVE_LZO
+INNODB_HAVE_LZMA
+INNODB_HAVE_BZIP2
+INNODB_HAVE_SNAPPY
+INNODB_HAVE_PUNCH_HOLE
+INNODB_DEFRAGMENT_COMPRESSION_FAILURES
+INNODB_DEFRAGMENT_FAILURES
+INNODB_DEFRAGMENT_COUNT
+INNODB_INSTANT_ALTER_COLUMN
+INNODB_ONLINEDDL_ROWLOG_ROWS
+INNODB_ONLINEDDL_ROWLOG_PCT_USED
+INNODB_ONLINEDDL_PCT_PROGRESS
+INNODB_SECONDARY_INDEX_TRIGGERED_CLUSTER_READS
+INNODB_SECONDARY_INDEX_TRIGGERED_CLUSTER_READS_AVOIDED
+INNODB_ENCRYPTION_ROTATION_PAGES_READ_FROM_CACHE
+INNODB_ENCRYPTION_ROTATION_PAGES_READ_FROM_DISK
+INNODB_ENCRYPTION_ROTATION_PAGES_MODIFIED
+INNODB_ENCRYPTION_ROTATION_PAGES_FLUSHED
+INNODB_ENCRYPTION_ROTATION_ESTIMATED_IOPS
+INNODB_ENCRYPTION_KEY_ROTATION_LIST_LENGTH
+INNODB_ENCRYPTION_N_MERGE_BLOCKS_ENCRYPTED
+INNODB_ENCRYPTION_N_MERGE_BLOCKS_DECRYPTED
+INNODB_ENCRYPTION_N_ROWLOG_BLOCKS_ENCRYPTED
+INNODB_ENCRYPTION_N_ROWLOG_BLOCKS_DECRYPTED
+INNODB_ENCRYPTION_N_TEMP_BLOCKS_ENCRYPTED
+INNODB_ENCRYPTION_N_TEMP_BLOCKS_DECRYPTED
+INNODB_ENCRYPTION_NUM_KEY_REQUESTS

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

+--source include/have_innodb.inc
+SELECT variable_name FROM information_schema.global_status
+WHERE variable_name LIKE 'INNODB_%'
+AND variable_name NOT IN
+('INNODB_ADAPTIVE_HASH_HASH_SEARCHES','INNODB_ADAPTIVE_HASH_NON_HASH_SEARCHES',
+ 'INNODB_MEM_ADAPTIVE_HASH',
+ 'INNODB_BUFFERED_AIO_SUBMITTED','INNODB_BUFFER_POOL_PAGES_LATCHED');

storage/innobase/handler/ha_innodb.cc

@@ -1090,6 +1090,8 @@ static SHOW_VAR innodb_status_variables[]= {
    &export_vars.innodb_n_temp_blocks_encrypted, SHOW_LONGLONG},
   {"encryption_n_temp_blocks_decrypted",
    &export_vars.innodb_n_temp_blocks_decrypted, SHOW_LONGLONG},
+  {"encryption_num_key_requests", &export_vars.innodb_encryption_key_requests,
+   SHOW_LONGLONG},
 
   {NullS, NullS, SHOW_LONG}
 };