From 1b5e5bdef31c5909fe98adc6a29a0bdc767da9aa Mon Sep 17 00:00:00 2001 From: Monty Date: Wed, 14 Aug 2019 00:18:58 +0300 Subject: MDEV-20306 Assert when converting encrypted Aria table to S3 Changes: - maria_create() now uses a bit in the parameter flags to check if table should be encrypted instead of using maria_encrypted_tables. - Don't encrypt tables that are to be converted to S3 - Added encrypted flag to ARIA_TABLE_CAPABILITIES - maria_chk --description now prints if table is encrypted. Other operations is not allowed on encrypted tables. --- include/aria_backup.h | 1 + include/my_base.h | 1 + 2 files changed, 2 insertions(+) (limited to 'include') diff --git a/include/aria_backup.h b/include/aria_backup.h index 5cc5f43d9b6..30c139c4234 100644 --- a/include/aria_backup.h +++ b/include/aria_backup.h @@ -26,6 +26,7 @@ typedef struct st_aria_table_capabilities enum data_file_type data_file_type; my_bool checksum; my_bool transactional; + my_bool encrypted; /* This is true if the table can be copied without any locks */ my_bool online_backup_safe; /* s3 capabilities */ diff --git a/include/my_base.h b/include/my_base.h index e73844d0937..c7cccaebf3a 100644 --- a/include/my_base.h +++ b/include/my_base.h @@ -368,6 +368,7 @@ enum ha_base_keytype { #define HA_CREATE_INTERNAL_TABLE 256U #define HA_PRESERVE_INSERT_ORDER 512U #define HA_CREATE_NO_ROLLBACK 1024U +#define HA_CREATE_ENCRYPTED 2048U /* Flags used by start_bulk_insert */ -- cgit v1.2.1