diff options
| author | Monty <monty@mariadb.org> | 2019-08-14 00:18:58 +0300 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2019-08-23 22:02:39 +0200 |
| commit | 1b5e5bdef31c5909fe98adc6a29a0bdc767da9aa (patch) | |
| tree | 2d9be76b9a165c0b47d8c1212ef8de946903fcd2 /include/my_base.h | |
| parent | bb6d674df91c6e7f6ea8bb68c916593d02b16ab6 (diff) | |
| download | mariadb-git-1b5e5bdef31c5909fe98adc6a29a0bdc767da9aa.tar.gz | |
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.
Diffstat (limited to 'include/my_base.h')
| -rw-r--r-- | include/my_base.h | 1 |
1 files changed, 1 insertions, 0 deletions
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 */ |