Skip to content

M
MariaDB
Commit f130da7b authored by Sergei Golubchik's avatar Sergei Golubchik
Browse files
Options

clarify/simplify new innodb sysvars: help texts

parent 87cf8651
Show whitespace changes
Inline Side-by-side
Showing with 16 additions and 12 deletions
mysql-test/suite/sys_vars/r/sysvars_innodb.result
View file @ f130da7b
...@@ -740,7 +740,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME ...@@ -740,7 +740,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE 1 DEFAULT_VALUE 1
VARIABLE_SCOPE GLOBAL VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE INT UNSIGNED VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT Rotate any page having a key older than this VARIABLE_COMMENT Key rotation - re-encrypt in background all pages that were encrypted with a key that many (or more) versions behind
NUMERIC_MIN_VALUE 0 NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 4294967295 NUMERIC_MAX_VALUE 4294967295
NUMERIC_BLOCK_SIZE 0 NUMERIC_BLOCK_SIZE 0
...@@ -768,7 +768,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME ...@@ -768,7 +768,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE 0 DEFAULT_VALUE 0
VARIABLE_SCOPE GLOBAL VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE INT UNSIGNED VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT No of threads performing background key rotation and scrubbing VARIABLE_COMMENT Number of threads performing background key rotation and scrubbing
NUMERIC_MIN_VALUE 0 NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 4294967295 NUMERIC_MAX_VALUE 4294967295
NUMERIC_BLOCK_SIZE 0 NUMERIC_BLOCK_SIZE 0
...@@ -796,7 +796,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME ...@@ -796,7 +796,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE OFF DEFAULT_VALUE OFF
VARIABLE_SCOPE GLOBAL VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE BOOLEAN VARIABLE_TYPE BOOLEAN
VARIABLE_COMMENT Encrypt all tables in the storage engine VARIABLE_COMMENT Enable InnoDB on-disk data encryption
NUMERIC_MIN_VALUE NULL NUMERIC_MIN_VALUE NULL
NUMERIC_MAX_VALUE NULL NUMERIC_MAX_VALUE NULL
NUMERIC_BLOCK_SIZE NULL NUMERIC_BLOCK_SIZE NULL
...@@ -1860,7 +1860,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME ...@@ -1860,7 +1860,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE OFF DEFAULT_VALUE OFF
VARIABLE_SCOPE GLOBAL VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE BOOLEAN VARIABLE_TYPE BOOLEAN
VARIABLE_COMMENT Enable redo log scrubbing VARIABLE_COMMENT Enable background redo log (ib_logfile0, ib_logfile1...) scrubbing
NUMERIC_MIN_VALUE NULL NUMERIC_MIN_VALUE NULL
NUMERIC_MAX_VALUE NULL NUMERIC_MAX_VALUE NULL
NUMERIC_BLOCK_SIZE NULL NUMERIC_BLOCK_SIZE NULL
......
storage/innobase/handler/ha_innodb.cc
View file @ f130da7b
...@@ -19125,12 +19125,12 @@ static MYSQL_SYSVAR_ULONG(fatal_semaphore_wait_threshold, srv_fatal_semaphore_wa ...@@ -19125,12 +19125,12 @@ static MYSQL_SYSVAR_ULONG(fatal_semaphore_wait_threshold, srv_fatal_semaphore_wa
0); 0);
static MYSQL_SYSVAR_BOOL(encrypt_tables, srv_encrypt_tables, 0, static MYSQL_SYSVAR_BOOL(encrypt_tables, srv_encrypt_tables, 0,
"Encrypt all tables in the storage engine", "Enable InnoDB on-disk data encryption",
0, 0, 0); 0, 0, 0);
static MYSQL_SYSVAR_UINT(encryption_threads, srv_n_fil_crypt_threads, static MYSQL_SYSVAR_UINT(encryption_threads, srv_n_fil_crypt_threads,
PLUGIN_VAR_RQCMDARG, PLUGIN_VAR_RQCMDARG,
"No of threads performing background key rotation and " "Number of threads performing background key rotation and "
"scrubbing", "scrubbing",
NULL, NULL,
innodb_encryption_threads_update, innodb_encryption_threads_update,
...@@ -19139,7 +19139,9 @@ static MYSQL_SYSVAR_UINT(encryption_threads, srv_n_fil_crypt_threads, ...@@ -19139,7 +19139,9 @@ static MYSQL_SYSVAR_UINT(encryption_threads, srv_n_fil_crypt_threads,
static MYSQL_SYSVAR_UINT(encryption_rotate_key_age, static MYSQL_SYSVAR_UINT(encryption_rotate_key_age,
srv_fil_crypt_rotate_key_age, srv_fil_crypt_rotate_key_age,
PLUGIN_VAR_RQCMDARG, PLUGIN_VAR_RQCMDARG,
"Rotate any page having a key older than this", "Key rotation - re-encrypt in background "
"all pages that were encrypted with a key that "
"many (or more) versions behind",
NULL, NULL,
innodb_encryption_rotate_key_age_update, innodb_encryption_rotate_key_age_update,
srv_fil_crypt_rotate_key_age, 0, UINT_MAX32, 0); srv_fil_crypt_rotate_key_age, 0, UINT_MAX32, 0);
...@@ -19160,7 +19162,7 @@ static MYSQL_SYSVAR_UINT(default_page_encryption_key, srv_default_page_encryptio ...@@ -19160,7 +19162,7 @@ static MYSQL_SYSVAR_UINT(default_page_encryption_key, srv_default_page_encryptio
static MYSQL_SYSVAR_BOOL(scrub_log, srv_scrub_log, static MYSQL_SYSVAR_BOOL(scrub_log, srv_scrub_log,
PLUGIN_VAR_OPCMDARG | PLUGIN_VAR_READONLY, PLUGIN_VAR_OPCMDARG | PLUGIN_VAR_READONLY,
"Enable redo log scrubbing", "Enable background redo log (ib_logfile0, ib_logfile1...) scrubbing",
0, 0, 0); 0, 0, 0);
static MYSQL_SYSVAR_ULONGLONG(scrub_log_speed, innodb_scrub_log_speed, static MYSQL_SYSVAR_ULONGLONG(scrub_log_speed, innodb_scrub_log_speed,
......
storage/xtradb/handler/ha_innodb.cc
View file @ f130da7b
...@@ -20308,12 +20308,12 @@ static MYSQL_SYSVAR_ULONG(fatal_semaphore_wait_threshold, srv_fatal_semaphore_wa ...@@ -20308,12 +20308,12 @@ static MYSQL_SYSVAR_ULONG(fatal_semaphore_wait_threshold, srv_fatal_semaphore_wa
0); 0);
static MYSQL_SYSVAR_BOOL(encrypt_tables, srv_encrypt_tables, 0, static MYSQL_SYSVAR_BOOL(encrypt_tables, srv_encrypt_tables, 0,
"Encrypt all tables in the storage engine", "Enable InnoDB on-disk data encryption",
0, 0, 0); 0, 0, 0);
static MYSQL_SYSVAR_UINT(encryption_threads, srv_n_fil_crypt_threads, static MYSQL_SYSVAR_UINT(encryption_threads, srv_n_fil_crypt_threads,
PLUGIN_VAR_RQCMDARG, PLUGIN_VAR_RQCMDARG,
"No of threads performing background key rotation and " "Number of threads performing background key rotation and "
"scrubbing", "scrubbing",
NULL, NULL,
innodb_encryption_threads_update, innodb_encryption_threads_update,
...@@ -20322,7 +20322,9 @@ static MYSQL_SYSVAR_UINT(encryption_threads, srv_n_fil_crypt_threads, ...@@ -20322,7 +20322,9 @@ static MYSQL_SYSVAR_UINT(encryption_threads, srv_n_fil_crypt_threads,
static MYSQL_SYSVAR_UINT(encryption_rotate_key_age, static MYSQL_SYSVAR_UINT(encryption_rotate_key_age,
srv_fil_crypt_rotate_key_age, srv_fil_crypt_rotate_key_age,
PLUGIN_VAR_RQCMDARG, PLUGIN_VAR_RQCMDARG,
"Rotate any page having a key older than this", "Key rotation - re-encrypt in background "
"all pages that were encrypted with a key that "
"many (or more) versions behind",
NULL, NULL,
innodb_encryption_rotate_key_age_update, innodb_encryption_rotate_key_age_update,
srv_fil_crypt_rotate_key_age, 0, UINT_MAX32, 0); srv_fil_crypt_rotate_key_age, 0, UINT_MAX32, 0);
...@@ -20343,7 +20345,7 @@ static MYSQL_SYSVAR_UINT(default_page_encryption_key, srv_default_page_encryptio ...@@ -20343,7 +20345,7 @@ static MYSQL_SYSVAR_UINT(default_page_encryption_key, srv_default_page_encryptio
static MYSQL_SYSVAR_BOOL(scrub_log, srv_scrub_log, static MYSQL_SYSVAR_BOOL(scrub_log, srv_scrub_log,
PLUGIN_VAR_OPCMDARG | PLUGIN_VAR_READONLY, PLUGIN_VAR_OPCMDARG | PLUGIN_VAR_READONLY,
"Enable redo log scrubbing", "Enable background redo log (ib_logfile0, ib_logfile1...) scrubbing",
0, 0, 0); 0, 0, 0);
static MYSQL_SYSVAR_ULONGLONG(scrub_log_speed, innodb_scrub_log_speed, static MYSQL_SYSVAR_ULONGLONG(scrub_log_speed, innodb_scrub_log_speed,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7