database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

MDEV-28671 post-merge fixes

Browse Source 
* use new deprecated printer for all deprecated server options
* restore alphabetic option sorting order
* move deprecated printer from mysqld.cc to my_getopt.c
* in --help print deprecation message at the end of the option help
* move 'ALL' help text where it belongs - to other SET options, and
  with a correct indentation.
* consistently end all or none command-line option help strings
  with a dot - my_print_help() needs that.
  It's about 50/50 now, so let's do none, less line wraps in --help
* remove trailing spaces from command-line option help strings
This commit is contained in:
Sergei Golubchik
2024-03-12 15:26:29 +01:00
parent 4186fa72fb
commit df10a945fc
42 changed files with 1704 additions and 1756 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
mysql-test/main/mysqld--help,aix.rdiff
View File

@@ -1,17 +1,15 @@
diff --git a/mysql-test/main/mysqld--help.result b/mysql-test/main/mysqld--help.result
index 7b0ce27ead3..38176dcaa86 100644
--- a/mysql-test/main/mysqld--help.result
+++ b/mysql-test/main/mysqld--help.result
@@ -1301,8 +1301,6 @@ The following specify which files/extra groups are read (specified before remain
@@ -1441,8 +1441,6 @@
WHERE clause, or a LIMIT clause, or else they will
aborted. Prevents the common mistake of accidentally
deleting or updating every row in a table.
deleting or updating every row in a table
- --stack-trace Print a symbolic stack trace on failure
- (Defaults to on; use --skip-stack-trace to disable.)
--standard-compliant-cte
Allow only CTEs compliant to SQL standard
(Defaults to on; use --skip-standard-compliant-cte to disable.)
@@ -1367,39 +1365,6 @@ The following specify which files/extra groups are read (specified before remain
@@ -1511,39 +1509,6 @@
--thread-cache-size=#
How many threads we should keep in a cache for reuse.
These are freed after 5 minutes of idle time
@@ -28,7 +26,7 @@ index 7b0ce27ead3..38176dcaa86 100644
- pool
- --thread-pool-oversubscribe=#
- How many additional active worker threads in a group are
- allowed.
- allowed
- --thread-pool-prio-kickup-timer=#
- The number of milliseconds before a dequeued low-priority
- statement is moved to the high-priority queue
@@ -37,21 +35,21 @@ index 7b0ce27ead3..38176dcaa86 100644
- start executing earlier than low priority.If priority set
- to 'auto', the the actual priority(low or high) is
- determined based on whether or not connection is inside
- transaction.
- transaction
- --thread-pool-size=#
- Number of thread groups in the pool. This parameter is
- roughly equivalent to maximum number of concurrently
- executing threads (threads in a waiting state do not
- count as executing).
- count as executing)
- --thread-pool-stall-limit=#
- Maximum query execution time in milliseconds,before an
- executing non-yielding thread is considered stalled.If a
- worker thread is stalled, additional worker thread may be
- created to handle remaining clients.
- created to handle remaining clients
--thread-stack=# The stack size for each thread
--time-format=name The TIME format (ignored)
--tls-version=name TLS protocol version for secure connections.. Any
@@ -1788,7 +1753,6 @@ slow-query-log FALSE
--tls-version=name TLS protocol version for secure connections. Any
combination of: TLSv1.0, TLSv1.1, TLSv1.2, TLSv1.3, or
@@ -1965,7 +1930,6 @@
sort-buffer-size 2097152
sql-mode STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION
sql-safe-updates FALSE
@@ -59,7 +57,7 @@ index 7b0ce27ead3..38176dcaa86 100644
standard-compliant-cte TRUE
stored-program-cache 256
strict-password-validation TRUE
@@ -1807,14 +1771,6 @@ tcp-keepalive-probes 0
@@ -1985,14 +1949,6 @@
tcp-keepalive-time 0
tcp-nodelay TRUE
thread-cache-size 151
@@ -72,5 +70,5 @@ index 7b0ce27ead3..38176dcaa86 100644
-thread-pool-priority auto
-thread-pool-stall-limit 500
thread-stack 299008
time-format %H:%i:%s
tmp-disk-table-size 18446744073709551615
tmp-memory-table-size 16777216

42
mysql-test/main/mysqld--help,win.rdiff
View File

@@ -1,55 +1,55 @@
--- main/mysqld--help.result 2023-11-30 02:21:51.951132200 +0100
+++ main/mysqld--help,win.reject 2023-11-30 02:35:44.404612300 +0100
@@ -191,6 +191,7 @@
--- a/mysql-test/main/mysqld--help.result
+++ b/mysql-test/main/mysqld--help.result
@@ -220,6 +220,7 @@
--console Write error output on screen; don't remove the console
window on windows.
window on windows
--core-file Write core on crashes
+ (Defaults to on; use --skip-core-file to disable.)
-h, --datadir=name Path to the database root directory
--date-format=name The DATE format (ignored)
--datetime-format=name
@@ -696,6 +697,7 @@
--deadlock-search-depth-long=#
Long search depth for the two-step deadlock detection
@@ -722,6 +723,7 @@
Use MySQL-5.6 (instead of MariaDB-5.3) format for TIME,
DATETIME, TIMESTAMP columns.
DATETIME, TIMESTAMP columns
(Defaults to on; use --skip-mysql56-temporal-format to disable.)
+ --named-pipe Enable the named pipe (NT)
--net-buffer-length=#
Buffer length for TCP/IP and socket communication
--net-read-timeout=#
@@ -1351,6 +1353,10 @@
@@ -1419,6 +1421,10 @@
Alias for log_slow_query_file. Log slow queries to given
log file. Defaults logging to 'hostname'-slow.log. Must
be enabled to activate other slow log options
+ --slow-start-timeout=#
+ Maximum number of milliseconds that the service control
+ manager should wait before trying to kill the windows
+ service during startup(Default: 15000).
+ service during startup(Default: 15000)
--socket=name Socket file to use for connection
--sort-buffer-size=#
Each thread that needs to do a sort allocates a buffer of
@@ -1376,6 +1382,7 @@
deleting or updating every row in a table.
@@ -1443,6 +1449,7 @@
deleting or updating every row in a table
--stack-trace Print a symbolic stack trace on failure
(Defaults to on; use --skip-stack-trace to disable.)
+ --standalone Dummy option to start as a standalone program (NT).
+ --standalone Dummy option to start as a standalone program (NT)
--standard-compliant-cte
Allow only CTEs compliant to SQL standard
(Defaults to on; use --skip-standard-compliant-cte to disable.)
@@ -1454,6 +1461,11 @@
@@ -1522,6 +1529,11 @@
--thread-pool-max-threads=#
Maximum allowed number of worker threads in the thread
pool
+ --thread-pool-min-threads=#
+ Minimum number of threads in the thread pool.
+ Minimum number of threads in the thread pool
+ --thread-pool-mode=name
+ Chose implementation of the threadpool. One of: windows,
+ generic
--thread-pool-oversubscribe=#
How many additional active worker threads in a group are
allowed.
@@ -1493,8 +1505,8 @@
allowed
@@ -1560,8 +1572,8 @@
automatically convert it to an on-disk MyISAM or Aria
table.
table
-t, --tmpdir=name Path for temporary files. Several paths may be specified,
- separated by a colon (:), in this case they are used in a
- round-robin fashion
@@ -58,7 +58,7 @@
--transaction-alloc-block-size=#
Allocation block size for transactions to be stored in
binary log
@@ -1716,6 +1728,7 @@
@@ -1788,6 +1800,7 @@
myisam-stats-method NULLS_UNEQUAL
myisam-use-mmap FALSE
mysql56-temporal-format TRUE
@@ -66,7 +66,7 @@
net-buffer-length 16384
net-read-timeout 30
net-retry-count 10
@@ -1874,6 +1887,7 @@
@@ -1962,6 +1975,7 @@
slave-type-conversions
slow-launch-time 2
slow-query-log FALSE
@@ -74,7 +74,7 @@
sort-buffer-size 2097152
sql-mode STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION
sql-safe-updates FALSE
@@ -1901,6 +1915,8 @@
@@ -1989,6 +2003,8 @@
thread-pool-exact-stats FALSE
thread-pool-idle-timeout 60
thread-pool-max-threads 65536

3
mysql-test/main/mysqld--help-aria.result
View File

@@ -1,9 +1,12 @@
flush tables;
[Warning] --table-cache is deprecated and will be removed in a future release. Please use --table-open-cache instead.
#
# Check that we don't write any data to wrong or not existing datadir
#
[Warning] --table-cache is deprecated and will be removed in a future release. Please use --table-open-cache instead.
[Warning] Could not open mysql.plugin table: "Table 'mysql.plugin' doesn't exist". Some options may be missing from the help text
#
# Check with existing directory
#
[Warning] --table-cache is deprecated and will be removed in a future release. Please use --table-open-cache instead.
[Warning] Could not open mysql.plugin table: "Table 'mysql.plugin' doesn't exist". Some options may be missing from the help text

518
mysql-test/main/mysqld--help.result
View File

File diff suppressed because it is too large Load Diff

2
mysql-test/main/statistics_json.result
View File

@@ -7392,7 +7392,7 @@ DROP TABLE t1;
#
select variable_comment from information_schema.system_variables where VARIABLE_NAME='HISTOGRAM_TYPE';
variable_comment
Specifies type of the histograms created by ANALYZE. Possible values are: SINGLE_PREC_HB - single precision height-balanced, DOUBLE_PREC_HB - double precision height-balanced, JSON_HB - height-balanced, stored as JSON.
Specifies type of the histograms created by ANALYZE. Possible values are: SINGLE_PREC_HB - single precision height-balanced, DOUBLE_PREC_HB - double precision height-balanced, JSON_HB - height-balanced, stored as JSON
#
# MDEV-26709: JSON histogram may contain bucketS than histogram_size allows
#

16
mysql-test/suite/sys_vars/r/sysvars_aria,32bit.rdiff
View File

@@ -6,7 +6,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT UNSIGNED
+VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT Block size to be used for Aria index pages.
VARIABLE_COMMENT Block size to be used for Aria index pages
NUMERIC_MIN_VALUE 4096
NUMERIC_MAX_VALUE 32768
@@ -17,7 +17,7 @@
@@ -15,7 +15,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT UNSIGNED
+VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT Interval between tries to do an automatic checkpoints. In seconds; 0 means 'no automatic checkpoints' which makes sense only for testing.
VARIABLE_COMMENT Interval between tries to do an automatic checkpoints. In seconds; 0 means 'no automatic checkpoints' which makes sense only for testing
NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 4294967295
@@ -29,7 +29,7 @@
@@ -24,7 +24,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT UNSIGNED
+VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT Number of bytes that the transaction log has to grow between checkpoints before a new checkpoint is written to the log.
VARIABLE_COMMENT Number of bytes that the transaction log has to grow between checkpoints before a new checkpoint is written to the log
NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 4294967295
@@ -53,7 +53,7 @@
@@ -33,7 +33,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT UNSIGNED
+VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT Number of consecutive log recovery failures after which logs will be automatically deleted to cure the problem; 0 (the default) disables the feature.
VARIABLE_COMMENT Number of consecutive log recovery failures after which logs will be automatically deleted to cure the problem; 0 (the default) disables the feature
NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 255
@@ -77,7 +77,7 @@
@@ -60,7 +60,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT UNSIGNED
+VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT This characterizes the number of hits a hot block has to be untouched until it is considered aged enough to be downgraded to a warm block. This specifies the percentage ratio of that number of hits to the total number of blocks in the page cache.
VARIABLE_COMMENT This characterizes the number of hits a hot block has to be untouched until it is considered aged enough to be downgraded to a warm block. This specifies the percentage ratio of that number of hits to the total number of blocks in the page cache
NUMERIC_MIN_VALUE 100
-NUMERIC_MAX_VALUE 18446744073709551615
+NUMERIC_MAX_VALUE 4294967295
@@ -82,7 +82,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT UNSIGNED
+VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT Number of hash buckets for open and changed files. If you have a lot of Aria files open you should increase this for faster flush of changes. A good value is probably 1/10 of number of possible open Aria files.
VARIABLE_COMMENT Number of hash buckets for open and changed files. If you have a lot of Aria files open you should increase this for faster flush of changes. A good value is probably 1/10 of number of possible open Aria files
NUMERIC_MIN_VALUE 128
NUMERIC_MAX_VALUE 16384
@@ -209,7 +209,7 @@
@@ -91,12 +91,12 @@
VARIABLE_SCOPE SESSION
-VARIABLE_TYPE BIGINT UNSIGNED
+VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT Number of threads to use when repairing Aria tables. The value of 1 disables parallel repair.
VARIABLE_COMMENT Number of threads to use when repairing Aria tables. The value of 1 disables parallel repair
NUMERIC_MIN_VALUE 1
NUMERIC_MAX_VALUE 128
@@ -224,7 +224,7 @@
VARIABLE_TYPE BIGINT UNSIGNED
VARIABLE_COMMENT The buffer that is allocated when sorting the index when doing a REPAIR or when creating indexes with CREATE INDEX or ALTER TABLE.
VARIABLE_COMMENT The buffer that is allocated when sorting the index when doing a REPAIR or when creating indexes with CREATE INDEX or ALTER TABLE
NUMERIC_MIN_VALUE 16376
-NUMERIC_MAX_VALUE 1152921504606846975
+NUMERIC_MAX_VALUE 268435455

20
mysql-test/suite/sys_vars/r/sysvars_aria.result
View File

@@ -6,7 +6,7 @@ SESSION_VALUE NULL
DEFAULT_VALUE 8192
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE BIGINT UNSIGNED
VARIABLE_COMMENT Block size to be used for Aria index pages.
VARIABLE_COMMENT Block size to be used for Aria index pages
NUMERIC_MIN_VALUE 4096
NUMERIC_MAX_VALUE 32768
NUMERIC_BLOCK_SIZE 1024
@@ -18,7 +18,7 @@ SESSION_VALUE NULL
DEFAULT_VALUE 30
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE BIGINT UNSIGNED
VARIABLE_COMMENT Interval between tries to do an automatic checkpoints. In seconds; 0 means 'no automatic checkpoints' which makes sense only for testing.
VARIABLE_COMMENT Interval between tries to do an automatic checkpoints. In seconds; 0 means 'no automatic checkpoints' which makes sense only for testing
NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 4294967295
NUMERIC_BLOCK_SIZE 1
@@ -30,7 +30,7 @@ SESSION_VALUE NULL
DEFAULT_VALUE 1048576
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE BIGINT UNSIGNED
VARIABLE_COMMENT Number of bytes that the transaction log has to grow between checkpoints before a new checkpoint is written to the log.
VARIABLE_COMMENT Number of bytes that the transaction log has to grow between checkpoints before a new checkpoint is written to the log
NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 4294967295
NUMERIC_BLOCK_SIZE 1
@@ -54,7 +54,7 @@ SESSION_VALUE NULL
DEFAULT_VALUE 0
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE BIGINT UNSIGNED
VARIABLE_COMMENT Number of consecutive log recovery failures after which logs will be automatically deleted to cure the problem; 0 (the default) disables the feature.
VARIABLE_COMMENT Number of consecutive log recovery failures after which logs will be automatically deleted to cure the problem; 0 (the default) disables the feature
NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 255
NUMERIC_BLOCK_SIZE 1
@@ -126,7 +126,7 @@ SESSION_VALUE NULL
DEFAULT_VALUE 9223372036853727232
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE BIGINT UNSIGNED
VARIABLE_COMMENT Don't use the fast sort index method to created index if the temporary file would get bigger than this.
VARIABLE_COMMENT Don't use the fast sort index method to created index if the temporary file would get bigger than this
NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 9223372036854775807
NUMERIC_BLOCK_SIZE 1048576
@@ -138,7 +138,7 @@ SESSION_VALUE NULL
DEFAULT_VALUE 300
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE BIGINT UNSIGNED
VARIABLE_COMMENT This characterizes the number of hits a hot block has to be untouched until it is considered aged enough to be downgraded to a warm block. This specifies the percentage ratio of that number of hits to the total number of blocks in the page cache.
VARIABLE_COMMENT This characterizes the number of hits a hot block has to be untouched until it is considered aged enough to be downgraded to a warm block. This specifies the percentage ratio of that number of hits to the total number of blocks in the page cache
NUMERIC_MIN_VALUE 100
NUMERIC_MAX_VALUE 18446744073709551615
NUMERIC_BLOCK_SIZE 100
@@ -150,7 +150,7 @@ SESSION_VALUE NULL
DEFAULT_VALUE 134217728
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE BIGINT UNSIGNED
VARIABLE_COMMENT The size of the buffer used for index blocks for Aria tables. Increase this to get better index handling (for all reads and multiple writes) to as much as you can afford.
VARIABLE_COMMENT The size of the buffer used for index blocks for Aria tables. Increase this to get better index handling (for all reads and multiple writes) to as much as you can afford
NUMERIC_MIN_VALUE 131072
NUMERIC_MAX_VALUE 18446744073709551615
NUMERIC_BLOCK_SIZE 1
@@ -174,7 +174,7 @@ SESSION_VALUE NULL
DEFAULT_VALUE 512
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE BIGINT UNSIGNED
VARIABLE_COMMENT Number of hash buckets for open and changed files. If you have a lot of Aria files open you should increase this for faster flush of changes. A good value is probably 1/10 of number of possible open Aria files.
VARIABLE_COMMENT Number of hash buckets for open and changed files. If you have a lot of Aria files open you should increase this for faster flush of changes. A good value is probably 1/10 of number of possible open Aria files
NUMERIC_MIN_VALUE 128
NUMERIC_MAX_VALUE 16384
NUMERIC_BLOCK_SIZE 1
@@ -210,7 +210,7 @@ SESSION_VALUE 1
DEFAULT_VALUE 1
VARIABLE_SCOPE SESSION
VARIABLE_TYPE BIGINT UNSIGNED
VARIABLE_COMMENT Number of threads to use when repairing Aria tables. The value of 1 disables parallel repair.
VARIABLE_COMMENT Number of threads to use when repairing Aria tables. The value of 1 disables parallel repair
NUMERIC_MIN_VALUE 1
NUMERIC_MAX_VALUE 128
NUMERIC_BLOCK_SIZE 1
@@ -222,7 +222,7 @@ SESSION_VALUE 268434432
DEFAULT_VALUE 268434432
VARIABLE_SCOPE SESSION
VARIABLE_TYPE BIGINT UNSIGNED
VARIABLE_COMMENT The buffer that is allocated when sorting the index when doing a REPAIR or when creating indexes with CREATE INDEX or ALTER TABLE.
VARIABLE_COMMENT The buffer that is allocated when sorting the index when doing a REPAIR or when creating indexes with CREATE INDEX or ALTER TABLE
NUMERIC_MIN_VALUE 16376
NUMERIC_MAX_VALUE 1152921504606846975
NUMERIC_BLOCK_SIZE 1

80
mysql-test/suite/sys_vars/r/sysvars_innodb,32bit.rdiff
View File

@@ -1,5 +1,5 @@
--- sysvars_innodb.result
+++ sysvars_innodb.result,32bit
+++ sysvars_innodb.result
@@ -47,7 +47,7 @@
SESSION_VALUE NULL
DEFAULT_VALUE 8
@@ -24,7 +24,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT UNSIGNED
+VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT Size of a single memory chunk for resizing buffer pool. Online buffer pool resizing happens at this granularity. 0 means autosize this variable based on buffer pool size.
VARIABLE_COMMENT Size of a single memory chunk for resizing buffer pool. Online buffer pool resizing happens at this granularity. 0 means autosize this variable based on buffer pool size
NUMERIC_MIN_VALUE 0
-NUMERIC_MAX_VALUE 18446744073709551615
+NUMERIC_MAX_VALUE 4294967295
@@ -46,10 +46,10 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT UNSIGNED
+VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT A number between [0, 100] that tells how oftern buffer pool dump status in percentages should be printed. E.g. 10 means that buffer pool dump status is printed when every 10% of number of buffer pool pages are dumped. Default is 0 (only start and end status is printed).
VARIABLE_COMMENT A number between [0, 100] that tells how oftern buffer pool dump status in percentages should be printed. E.g. 10 means that buffer pool dump status is printed when every 10% of number of buffer pool pages are dumped. Default is 0 (only start and end status is printed)
NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 100
@@ -323,7 +323,7 @@
@@ -275,7 +275,7 @@
SESSION_VALUE NULL
DEFAULT_VALUE 5
VARIABLE_SCOPE GLOBAL
@@ -58,43 +58,43 @@
VARIABLE_COMMENT If the compression failure rate of a table is greater than this number more padding is added to the pages to reduce the failures. A value of zero implies no padding
NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 100
@@ -347,7 +347,7 @@
@@ -299,7 +299,7 @@
SESSION_VALUE NULL
DEFAULT_VALUE 50
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT UNSIGNED
+VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT Percentage of empty space on a data page that can be reserved to make the page compressible.
VARIABLE_COMMENT Percentage of empty space on a data page that can be reserved to make the page compressible
NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 75
@@ -623,7 +623,7 @@
@@ -527,7 +527,7 @@
SESSION_VALUE NULL
DEFAULT_VALUE 600
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT UNSIGNED
+VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT Maximum number of seconds that semaphore times out in InnoDB.
VARIABLE_COMMENT Maximum number of seconds that semaphore times out in InnoDB
NUMERIC_MIN_VALUE 1
NUMERIC_MAX_VALUE 4294967295
@@ -671,7 +671,7 @@
@@ -575,7 +575,7 @@
SESSION_VALUE NULL
DEFAULT_VALUE 30
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT UNSIGNED
+VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT Number of iterations over which the background flushing is averaged.
VARIABLE_COMMENT Number of iterations over which the background flushing is averaged
NUMERIC_MIN_VALUE 1
NUMERIC_MAX_VALUE 1000
@@ -695,7 +695,7 @@
@@ -599,7 +599,7 @@
SESSION_VALUE NULL
DEFAULT_VALUE 1
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT UNSIGNED
+VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT Controls the durability/speed trade-off for commits. Set to 0 (write and flush redo log to disk only once per second), 1 (flush to disk at each commit), 2 (write to log at commit but flush to disk only once per second) or 3 (flush to disk at prepare and at commit, slower and usually redundant). 1 and 3 guarantees that after a crash, committed transactions will not be lost and will be consistent with the binlog and other transactional engines. 2 can get inconsistent and lose transactions if there is a power failure or kernel crash but not if mysqld crashes. 0 has no guarantees in case of crash. 0 and 2 can be faster than 1 or 3.
VARIABLE_COMMENT Controls the durability/speed trade-off for commits. Set to 0 (write and flush redo log to disk only once per second), 1 (flush to disk at each commit), 2 (write to log at commit but flush to disk only once per second) or 3 (flush to disk at prepare and at commit, slower and usually redundant). 1 and 3 guarantees that after a crash, committed transactions will not be lost and will be consistent with the binlog and other transactional engines. 2 can get inconsistent and lose transactions if there is a power failure or kernel crash but not if mysqld crashes. 0 has no guarantees in case of crash. 0 and 2 can be faster than 1 or 3
NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 3
@@ -719,7 +719,7 @@
@@ -623,7 +623,7 @@
SESSION_VALUE NULL
DEFAULT_VALUE 1
VARIABLE_SCOPE GLOBAL
@@ -103,16 +103,16 @@
VARIABLE_COMMENT Set to 0 (don't flush neighbors from buffer pool), 1 (flush contiguous neighbors from buffer pool) or 2 (flush neighbors from buffer pool), when flushing a block
NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 2
@@ -755,7 +755,7 @@
@@ -659,7 +659,7 @@
SESSION_VALUE NULL
DEFAULT_VALUE 0
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT UNSIGNED
+VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT Helps to save your data in case the disk image of the database becomes corrupt. Value 5 can return bogus data, and 6 can permanently corrupt data.
VARIABLE_COMMENT Helps to save your data in case the disk image of the database becomes corrupt. Value 5 can return bogus data, and 6 can permanently corrupt data
NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 6
@@ -779,10 +779,10 @@
@@ -683,10 +683,10 @@
SESSION_VALUE NULL
DEFAULT_VALUE 8000000
VARIABLE_SCOPE GLOBAL
@@ -125,7 +125,7 @@
NUMERIC_BLOCK_SIZE 0
ENUM_VALUE_LIST NULL
READ_ONLY NO
@@ -815,7 +815,7 @@
@@ -719,7 +719,7 @@
SESSION_VALUE NULL
DEFAULT_VALUE 84
VARIABLE_SCOPE GLOBAL
@@ -134,7 +134,7 @@
VARIABLE_COMMENT InnoDB Fulltext search maximum token size in characters
NUMERIC_MIN_VALUE 10
NUMERIC_MAX_VALUE 84
@@ -827,7 +827,7 @@
@@ -731,7 +731,7 @@
SESSION_VALUE NULL
DEFAULT_VALUE 3
VARIABLE_SCOPE GLOBAL
@@ -143,16 +143,16 @@
VARIABLE_COMMENT InnoDB Fulltext search minimum token size in characters
NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 16
@@ -839,7 +839,7 @@
@@ -743,7 +743,7 @@
SESSION_VALUE NULL
DEFAULT_VALUE 2000
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT UNSIGNED
+VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT InnoDB Fulltext search number of words to optimize for each optimize table call
VARIABLE_COMMENT InnoDB Fulltext search number of words to optimize for each optimize table call
NUMERIC_MIN_VALUE 1000
NUMERIC_MAX_VALUE 10000
@@ -851,10 +851,10 @@
@@ -755,10 +755,10 @@
SESSION_VALUE NULL
DEFAULT_VALUE 2000000000
VARIABLE_SCOPE GLOBAL
@@ -165,7 +165,7 @@
NUMERIC_BLOCK_SIZE 0
ENUM_VALUE_LIST NULL
READ_ONLY NO
@@ -875,7 +875,7 @@
@@ -779,7 +779,7 @@
SESSION_VALUE NULL
DEFAULT_VALUE 2
VARIABLE_SCOPE GLOBAL
@@ -174,7 +174,7 @@
VARIABLE_COMMENT InnoDB Fulltext search parallel sort degree, will round up to nearest power of 2 number
NUMERIC_MIN_VALUE 1
NUMERIC_MAX_VALUE 16
@@ -887,10 +887,10 @@
@@ -791,10 +791,10 @@
SESSION_VALUE NULL
DEFAULT_VALUE 640000000
VARIABLE_SCOPE GLOBAL
@@ -187,7 +187,7 @@
NUMERIC_BLOCK_SIZE 0
ENUM_VALUE_LIST NULL
READ_ONLY NO
@@ -935,22 +935,22 @@
@@ -839,22 +839,22 @@
SESSION_VALUE NULL
DEFAULT_VALUE 200
VARIABLE_SCOPE GLOBAL
@@ -208,14 +208,14 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT UNSIGNED
+VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT Limit to which innodb_io_capacity can be inflated.
VARIABLE_COMMENT Limit to which innodb_io_capacity can be inflated
NUMERIC_MIN_VALUE 100
-NUMERIC_MAX_VALUE 18446744073709551615
+NUMERIC_MAX_VALUE 4294967295
NUMERIC_BLOCK_SIZE 0
ENUM_VALUE_LIST NULL
READ_ONLY NO
@@ -1043,10 +1043,10 @@
@@ -959,10 +959,10 @@
SESSION_VALUE NULL
DEFAULT_VALUE 32
VARIABLE_SCOPE GLOBAL
@@ -228,7 +228,7 @@
NUMERIC_BLOCK_SIZE 0
ENUM_VALUE_LIST NULL
READ_ONLY NO
@@ -1055,10 +1055,10 @@
@@ -971,10 +971,10 @@
SESSION_VALUE NULL
DEFAULT_VALUE 1536
VARIABLE_SCOPE GLOBAL
@@ -241,7 +241,7 @@
NUMERIC_BLOCK_SIZE 0
ENUM_VALUE_LIST NULL
READ_ONLY NO
@@ -1091,10 +1091,10 @@
@@ -1007,10 +1007,10 @@
SESSION_VALUE NULL
DEFAULT_VALUE 0
VARIABLE_SCOPE GLOBAL
@@ -254,7 +254,7 @@
NUMERIC_BLOCK_SIZE 0
ENUM_VALUE_LIST NULL
READ_ONLY NO
@@ -1103,7 +1103,7 @@
@@ -1019,7 +1019,7 @@
SESSION_VALUE NULL
DEFAULT_VALUE 0
VARIABLE_SCOPE GLOBAL
@@ -263,38 +263,38 @@
VARIABLE_COMMENT Maximum delay of user threads in micro-seconds
NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 10000000
@@ -1235,10 +1235,10 @@
@@ -1151,10 +1151,10 @@
SESSION_VALUE NULL
DEFAULT_VALUE 0
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT UNSIGNED
+VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT How many files at the maximum InnoDB keeps open at the same time.
VARIABLE_COMMENT How many files at the maximum InnoDB keeps open at the same time
NUMERIC_MIN_VALUE 0
-NUMERIC_MAX_VALUE 9223372036854775807
+NUMERIC_MAX_VALUE 2147483647
NUMERIC_BLOCK_SIZE 0
ENUM_VALUE_LIST NULL
READ_ONLY YES
@@ -1259,7 +1259,7 @@
@@ -1175,7 +1175,7 @@
SESSION_VALUE NULL
DEFAULT_VALUE 16384
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT UNSIGNED
+VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT Page size to use for all InnoDB tablespaces.
VARIABLE_COMMENT Page size to use for all InnoDB tablespaces
NUMERIC_MIN_VALUE 4096
NUMERIC_MAX_VALUE 65536
@@ -1295,7 +1295,7 @@
@@ -1211,7 +1211,7 @@
SESSION_VALUE NULL
DEFAULT_VALUE 1000
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT UNSIGNED
+VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT Number of UNDO log pages to purge in one batch from the history list.
VARIABLE_COMMENT Number of UNDO log pages to purge in one batch from the history list
NUMERIC_MIN_VALUE 1
NUMERIC_MAX_VALUE 5000
@@ -1307,7 +1307,7 @@
@@ -1223,7 +1223,7 @@
SESSION_VALUE NULL
DEFAULT_VALUE 128
VARIABLE_SCOPE GLOBAL
@@ -303,16 +303,16 @@
VARIABLE_COMMENT Deprecated parameter with no effect
NUMERIC_MIN_VALUE 1
NUMERIC_MAX_VALUE 128
@@ -1343,7 +1343,7 @@
@@ -1259,7 +1259,7 @@
SESSION_VALUE NULL
DEFAULT_VALUE 56
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT UNSIGNED
+VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT Number of pages that must be accessed sequentially for InnoDB to trigger a readahead.
VARIABLE_COMMENT Number of pages that must be accessed sequentially for InnoDB to trigger a readahead
NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 64
@@ -1427,7 +1427,7 @@
@@ -1343,7 +1343,7 @@
SESSION_VALUE NULL
DEFAULT_VALUE 1048576
VARIABLE_SCOPE GLOBAL
@@ -321,7 +321,7 @@
VARIABLE_COMMENT Memory buffer size for index creation
NUMERIC_MIN_VALUE 65536
NUMERIC_MAX_VALUE 67108864
@@ -1595,10 +1595,10 @@
@@ -1511,10 +1511,10 @@
SESSION_VALUE NULL
DEFAULT_VALUE 30
VARIABLE_SCOPE GLOBAL

122
mysql-test/suite/sys_vars/r/sysvars_innodb.result
View File

@@ -12,7 +12,7 @@ SESSION_VALUE NULL
DEFAULT_VALUE ON
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE BOOLEAN
VARIABLE_COMMENT Attempt flushing dirty pages to avoid IO bursts at checkpoints.
VARIABLE_COMMENT Attempt flushing dirty pages to avoid IO bursts at checkpoints
NUMERIC_MIN_VALUE NULL
NUMERIC_MAX_VALUE NULL
NUMERIC_BLOCK_SIZE NULL
@@ -24,7 +24,7 @@ SESSION_VALUE NULL
DEFAULT_VALUE 10.000000
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE DOUBLE
VARIABLE_COMMENT Percentage of log capacity below which no adaptive flushing happens.
VARIABLE_COMMENT Percentage of log capacity below which no adaptive flushing happens
NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 70
NUMERIC_BLOCK_SIZE NULL
@@ -36,7 +36,7 @@ SESSION_VALUE NULL
DEFAULT_VALUE OFF
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE BOOLEAN
VARIABLE_COMMENT Enable InnoDB adaptive hash index (disabled by default).
VARIABLE_COMMENT Enable InnoDB adaptive hash index (disabled by default)
NUMERIC_MIN_VALUE NULL
NUMERIC_MAX_VALUE NULL
NUMERIC_BLOCK_SIZE NULL
@@ -84,7 +84,7 @@ SESSION_VALUE NULL
DEFAULT_VALUE 0
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE BIGINT UNSIGNED
VARIABLE_COMMENT Size of a single memory chunk for resizing buffer pool. Online buffer pool resizing happens at this granularity. 0 means autosize this variable based on buffer pool size.
VARIABLE_COMMENT Size of a single memory chunk for resizing buffer pool. Online buffer pool resizing happens at this granularity. 0 means autosize this variable based on buffer pool size
NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 18446744073709551615
NUMERIC_BLOCK_SIZE 1048576
@@ -192,7 +192,7 @@ SESSION_VALUE NULL
DEFAULT_VALUE 134217728
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE BIGINT UNSIGNED
VARIABLE_COMMENT The size of the memory buffer InnoDB uses to cache data and indexes of its tables.
VARIABLE_COMMENT The size of the memory buffer InnoDB uses to cache data and indexes of its tables
NUMERIC_MIN_VALUE 2097152
NUMERIC_MAX_VALUE 9223372036854775807
NUMERIC_BLOCK_SIZE 1048576
@@ -204,7 +204,7 @@ SESSION_VALUE NULL
DEFAULT_VALUE 0
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE BIGINT UNSIGNED
VARIABLE_COMMENT A number between [0, 100] that tells how oftern buffer pool dump status in percentages should be printed. E.g. 10 means that buffer pool dump status is printed when every 10% of number of buffer pool pages are dumped. Default is 0 (only start and end status is printed).
VARIABLE_COMMENT A number between [0, 100] that tells how oftern buffer pool dump status in percentages should be printed. E.g. 10 means that buffer pool dump status is printed when every 10% of number of buffer pool pages are dumped. Default is 0 (only start and end status is printed)
NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 100
NUMERIC_BLOCK_SIZE 0
@@ -288,7 +288,7 @@ SESSION_VALUE NULL
DEFAULT_VALUE 6
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT Compression level used for zlib compression. 0 is no compression, 1 is fastest, 9 is best compression and default is 6.
VARIABLE_COMMENT Compression level used for zlib compression. 0 is no compression, 1 is fastest, 9 is best compression and default is 6
NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 9
NUMERIC_BLOCK_SIZE 0
@@ -300,7 +300,7 @@ SESSION_VALUE NULL
DEFAULT_VALUE 50
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE BIGINT UNSIGNED
VARIABLE_COMMENT Percentage of empty space on a data page that can be reserved to make the page compressible.
VARIABLE_COMMENT Percentage of empty space on a data page that can be reserved to make the page compressible
NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 75
NUMERIC_BLOCK_SIZE 0
@@ -324,7 +324,7 @@ SESSION_VALUE NULL
DEFAULT_VALUE ibdata1:12M:autoextend
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE VARCHAR
VARIABLE_COMMENT Path to individual files and their sizes.
VARIABLE_COMMENT Path to individual files and their sizes
NUMERIC_MIN_VALUE NULL
NUMERIC_MAX_VALUE NULL
NUMERIC_BLOCK_SIZE NULL
@@ -336,7 +336,7 @@ SESSION_VALUE NULL
DEFAULT_VALUE 0
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT InnoDB system tablespace size to be set in recovery.
VARIABLE_COMMENT InnoDB system tablespace size to be set in recovery
NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 268435456
NUMERIC_BLOCK_SIZE 0
@@ -360,7 +360,7 @@ SESSION_VALUE NULL
DEFAULT_VALUE
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE VARCHAR
VARIABLE_COMMENT The common part for InnoDB table spaces.
VARIABLE_COMMENT The common part for InnoDB table spaces
NUMERIC_MIN_VALUE NULL
NUMERIC_MAX_VALUE NULL
NUMERIC_BLOCK_SIZE NULL
@@ -372,7 +372,7 @@ SESSION_VALUE NULL
DEFAULT_VALUE ON
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE BOOLEAN
VARIABLE_COMMENT Enable/disable InnoDB deadlock detector (default ON). if set to OFF, deadlock detection is skipped, and we rely on innodb_lock_wait_timeout in case of deadlock.
VARIABLE_COMMENT Enable/disable InnoDB deadlock detector (default ON). if set to OFF, deadlock detection is skipped, and we rely on innodb_lock_wait_timeout in case of deadlock
NUMERIC_MIN_VALUE NULL
NUMERIC_MAX_VALUE NULL
NUMERIC_BLOCK_SIZE NULL
@@ -384,7 +384,7 @@ SESSION_VALUE NULL
DEFAULT_VALUE full
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE ENUM
VARIABLE_COMMENT How to report deadlocks (if innodb_deadlock_detect=ON).
VARIABLE_COMMENT How to report deadlocks (if innodb_deadlock_detect=ON)
NUMERIC_MIN_VALUE NULL
NUMERIC_MAX_VALUE NULL
NUMERIC_BLOCK_SIZE NULL
@@ -396,7 +396,7 @@ SESSION_VALUE 1
DEFAULT_VALUE 1
VARIABLE_SCOPE SESSION
VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT Default encryption key id used for table encryption.
VARIABLE_COMMENT Default encryption key id used for table encryption
NUMERIC_MIN_VALUE 1
NUMERIC_MAX_VALUE 4294967295
NUMERIC_BLOCK_SIZE 0
@@ -444,7 +444,7 @@ SESSION_VALUE NULL
DEFAULT_VALUE 1
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT Key rotation - re-encrypt in background all pages that were encrypted with a key that many (or more) versions behind. Value 0 indicates that key rotation is disabled.
VARIABLE_COMMENT Key rotation - re-encrypt in background all pages that were encrypted with a key that many (or more) versions behind. Value 0 indicates that key rotation is disabled
NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 4294967295
NUMERIC_BLOCK_SIZE 0
@@ -468,7 +468,7 @@ SESSION_VALUE NULL
DEFAULT_VALUE 0
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT Number of threads performing background key rotation
VARIABLE_COMMENT Number of threads performing background key rotation
NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 255
NUMERIC_BLOCK_SIZE 0
@@ -504,7 +504,7 @@ SESSION_VALUE NULL
DEFAULT_VALUE OFF
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE BOOLEAN
VARIABLE_COMMENT Enrypt the temporary table data.
VARIABLE_COMMENT Enrypt the temporary table data
NUMERIC_MIN_VALUE NULL
NUMERIC_MAX_VALUE NULL
NUMERIC_BLOCK_SIZE NULL
@@ -516,7 +516,7 @@ SESSION_VALUE NULL
DEFAULT_VALUE 1
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT Speeds up the shutdown process of the InnoDB storage engine. Possible values are 0, 1 (faster), 2 (crash-like), 3 (fastest clean).
VARIABLE_COMMENT Speeds up the shutdown process of the InnoDB storage engine. Possible values are 0, 1 (faster), 2 (crash-like), 3 (fastest clean)
NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 3
NUMERIC_BLOCK_SIZE 0
@@ -528,7 +528,7 @@ SESSION_VALUE NULL
DEFAULT_VALUE 600
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE BIGINT UNSIGNED
VARIABLE_COMMENT Maximum number of seconds that semaphore times out in InnoDB.
VARIABLE_COMMENT Maximum number of seconds that semaphore times out in InnoDB
NUMERIC_MIN_VALUE 1
NUMERIC_MAX_VALUE 4294967295
NUMERIC_BLOCK_SIZE 0
@@ -540,7 +540,7 @@ SESSION_VALUE NULL
DEFAULT_VALUE ON
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE BOOLEAN
VARIABLE_COMMENT Stores each InnoDB table to an .ibd file in the database dir.
VARIABLE_COMMENT Stores each InnoDB table to an .ibd file in the database dir
NUMERIC_MIN_VALUE NULL
NUMERIC_MAX_VALUE NULL
NUMERIC_BLOCK_SIZE NULL
@@ -564,7 +564,7 @@ SESSION_VALUE NULL
DEFAULT_VALUE 0
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT Make the first page of the given tablespace dirty.
VARIABLE_COMMENT Make the first page of the given tablespace dirty
NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 4294967295
NUMERIC_BLOCK_SIZE 0
@@ -576,7 +576,7 @@ SESSION_VALUE NULL
DEFAULT_VALUE 30
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE BIGINT UNSIGNED
VARIABLE_COMMENT Number of iterations over which the background flushing is averaged.
VARIABLE_COMMENT Number of iterations over which the background flushing is averaged
NUMERIC_MIN_VALUE 1
NUMERIC_MAX_VALUE 1000
NUMERIC_BLOCK_SIZE 0
@@ -588,7 +588,7 @@ SESSION_VALUE NULL
DEFAULT_VALUE 1
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT Write and flush logs every (n) second.
VARIABLE_COMMENT Write and flush logs every (n) second
NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 2700
NUMERIC_BLOCK_SIZE 0
@@ -600,7 +600,7 @@ SESSION_VALUE NULL
DEFAULT_VALUE 1
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE BIGINT UNSIGNED
VARIABLE_COMMENT Controls the durability/speed trade-off for commits. Set to 0 (write and flush redo log to disk only once per second), 1 (flush to disk at each commit), 2 (write to log at commit but flush to disk only once per second) or 3 (flush to disk at prepare and at commit, slower and usually redundant). 1 and 3 guarantees that after a crash, committed transactions will not be lost and will be consistent with the binlog and other transactional engines. 2 can get inconsistent and lose transactions if there is a power failure or kernel crash but not if mysqld crashes. 0 has no guarantees in case of crash. 0 and 2 can be faster than 1 or 3.
VARIABLE_COMMENT Controls the durability/speed trade-off for commits. Set to 0 (write and flush redo log to disk only once per second), 1 (flush to disk at each commit), 2 (write to log at commit but flush to disk only once per second) or 3 (flush to disk at prepare and at commit, slower and usually redundant). 1 and 3 guarantees that after a crash, committed transactions will not be lost and will be consistent with the binlog and other transactional engines. 2 can get inconsistent and lose transactions if there is a power failure or kernel crash but not if mysqld crashes. 0 has no guarantees in case of crash. 0 and 2 can be faster than 1 or 3
NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 3
NUMERIC_BLOCK_SIZE 0
@@ -612,7 +612,7 @@ SESSION_VALUE NULL
DEFAULT_VALUE O_DIRECT
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE ENUM
VARIABLE_COMMENT With which method to flush data.
VARIABLE_COMMENT With which method to flush data
NUMERIC_MIN_VALUE NULL
NUMERIC_MAX_VALUE NULL
NUMERIC_BLOCK_SIZE NULL
@@ -636,7 +636,7 @@ SESSION_VALUE NULL
DEFAULT_VALUE ON
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE BOOLEAN
VARIABLE_COMMENT Allow IO bursts at the checkpoints ignoring io_capacity setting.
VARIABLE_COMMENT Allow IO bursts at the checkpoints ignoring io_capacity setting
NUMERIC_MIN_VALUE NULL
NUMERIC_MAX_VALUE NULL
NUMERIC_BLOCK_SIZE NULL
@@ -660,7 +660,7 @@ SESSION_VALUE NULL
DEFAULT_VALUE 0
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE BIGINT UNSIGNED
VARIABLE_COMMENT Helps to save your data in case the disk image of the database becomes corrupt. Value 5 can return bogus data, and 6 can permanently corrupt data.
VARIABLE_COMMENT Helps to save your data in case the disk image of the database becomes corrupt. Value 5 can return bogus data, and 6 can permanently corrupt data
NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 6
NUMERIC_BLOCK_SIZE 0
@@ -696,7 +696,7 @@ SESSION_VALUE NULL
DEFAULT_VALUE OFF
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE BOOLEAN
VARIABLE_COMMENT Whether to enable additional FTS diagnostic printout
VARIABLE_COMMENT Whether to enable additional FTS diagnostic printout
NUMERIC_MIN_VALUE NULL
NUMERIC_MAX_VALUE NULL
NUMERIC_BLOCK_SIZE NULL
@@ -708,7 +708,7 @@ SESSION_VALUE ON
DEFAULT_VALUE ON
VARIABLE_SCOPE SESSION
VARIABLE_TYPE BOOLEAN
VARIABLE_COMMENT Create FTS index with stopword.
VARIABLE_COMMENT Create FTS index with stopword
NUMERIC_MIN_VALUE NULL
NUMERIC_MAX_VALUE NULL
NUMERIC_BLOCK_SIZE NULL
@@ -744,7 +744,7 @@ SESSION_VALUE NULL
DEFAULT_VALUE 2000
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE BIGINT UNSIGNED
VARIABLE_COMMENT InnoDB Fulltext search number of words to optimize for each optimize table call
VARIABLE_COMMENT InnoDB Fulltext search number of words to optimize for each optimize table call
NUMERIC_MIN_VALUE 1000
NUMERIC_MAX_VALUE 10000
NUMERIC_BLOCK_SIZE 0
@@ -768,7 +768,7 @@ SESSION_VALUE NULL
DEFAULT_VALUE
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE VARCHAR
VARIABLE_COMMENT The user supplied stopword table name.
VARIABLE_COMMENT The user supplied stopword table name
NUMERIC_MIN_VALUE NULL
NUMERIC_MAX_VALUE NULL
NUMERIC_BLOCK_SIZE NULL
@@ -804,7 +804,7 @@ SESSION_VALUE
DEFAULT_VALUE
VARIABLE_SCOPE SESSION
VARIABLE_TYPE VARCHAR
VARIABLE_COMMENT User supplied stopword table name, effective in the session level.
VARIABLE_COMMENT User supplied stopword table name, effective in the session level
NUMERIC_MIN_VALUE NULL
NUMERIC_MAX_VALUE NULL
NUMERIC_BLOCK_SIZE NULL
@@ -852,7 +852,7 @@ SESSION_VALUE NULL
DEFAULT_VALUE 18446744073709551615
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE BIGINT UNSIGNED
VARIABLE_COMMENT Limit to which innodb_io_capacity can be inflated.
VARIABLE_COMMENT Limit to which innodb_io_capacity can be inflated
NUMERIC_MIN_VALUE 100
NUMERIC_MAX_VALUE 18446744073709551615
NUMERIC_BLOCK_SIZE 0
@@ -864,7 +864,7 @@ SESSION_VALUE NULL
DEFAULT_VALUE 0
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT Artificially limit the number of records per B-tree page (0=unlimited).
VARIABLE_COMMENT Artificially limit the number of records per B-tree page (0=unlimited)
NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 4294967295
NUMERIC_BLOCK_SIZE 0
@@ -876,7 +876,7 @@ SESSION_VALUE 50
DEFAULT_VALUE 50
VARIABLE_SCOPE SESSION
VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT Timeout in seconds an InnoDB transaction may wait for a lock before being rolled back. The value 100000000 is infinite timeout.
VARIABLE_COMMENT Timeout in seconds an InnoDB transaction may wait for a lock before being rolled back. The value 100000000 is infinite timeout
NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 100000000
NUMERIC_BLOCK_SIZE 0
@@ -888,7 +888,7 @@ SESSION_VALUE NULL
DEFAULT_VALUE 16777216
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT Redo log buffer size in bytes.
VARIABLE_COMMENT Redo log buffer size in bytes
NUMERIC_MIN_VALUE 2097152
NUMERIC_MAX_VALUE 2147479552
NUMERIC_BLOCK_SIZE 4096
@@ -912,7 +912,7 @@ SESSION_VALUE NULL
DEFAULT_VALUE 100663296
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE BIGINT UNSIGNED
VARIABLE_COMMENT Redo log size in bytes.
VARIABLE_COMMENT Redo log size in bytes
NUMERIC_MIN_VALUE 4194304
NUMERIC_MAX_VALUE 18446744073709551615
NUMERIC_BLOCK_SIZE 4096
@@ -984,7 +984,7 @@ SESSION_VALUE NULL
DEFAULT_VALUE 90.000000
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE DOUBLE
VARIABLE_COMMENT Percentage of dirty pages allowed in bufferpool.
VARIABLE_COMMENT Percentage of dirty pages allowed in bufferpool
NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 99.999
NUMERIC_BLOCK_SIZE NULL
@@ -996,7 +996,7 @@ SESSION_VALUE NULL
DEFAULT_VALUE 0.000000
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE DOUBLE
VARIABLE_COMMENT Percentage of dirty pages at which flushing kicks in. The value 0 (default) means 'refer to innodb_max_dirty_pages_pct'.
VARIABLE_COMMENT Percentage of dirty pages at which flushing kicks in. The value 0 (default) means 'refer to innodb_max_dirty_pages_pct'
NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 99.999
NUMERIC_BLOCK_SIZE NULL
@@ -1056,7 +1056,7 @@ SESSION_VALUE NULL
DEFAULT_VALUE 50
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT Override current MERGE_THRESHOLD setting for all indexes at dictionary cache by the specified value dynamically, at the time.
VARIABLE_COMMENT Override current MERGE_THRESHOLD setting for all indexes at dictionary cache by the specified value dynamically, at the time
NUMERIC_MIN_VALUE 1
NUMERIC_MAX_VALUE 50
NUMERIC_BLOCK_SIZE 0
@@ -1116,7 +1116,7 @@ SESSION_VALUE NULL
DEFAULT_VALUE 37
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT Percentage of the buffer pool to reserve for 'old' blocks.
VARIABLE_COMMENT Percentage of the buffer pool to reserve for 'old' blocks
NUMERIC_MIN_VALUE 5
NUMERIC_MAX_VALUE 95
NUMERIC_BLOCK_SIZE 0
@@ -1128,7 +1128,7 @@ SESSION_VALUE NULL
DEFAULT_VALUE 1000
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT Move blocks to the 'new' end of the buffer pool if the first access was at least this many milliseconds ago. The timeout is disabled if 0.
VARIABLE_COMMENT Move blocks to the 'new' end of the buffer pool if the first access was at least this many milliseconds ago. The timeout is disabled if 0
NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 4294967295
NUMERIC_BLOCK_SIZE 0
@@ -1152,7 +1152,7 @@ SESSION_VALUE NULL
DEFAULT_VALUE 0
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE BIGINT UNSIGNED
VARIABLE_COMMENT How many files at the maximum InnoDB keeps open at the same time.
VARIABLE_COMMENT How many files at the maximum InnoDB keeps open at the same time
NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 9223372036854775807
NUMERIC_BLOCK_SIZE 0
@@ -1176,7 +1176,7 @@ SESSION_VALUE NULL
DEFAULT_VALUE 16384
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE BIGINT UNSIGNED
VARIABLE_COMMENT Page size to use for all InnoDB tablespaces.
VARIABLE_COMMENT Page size to use for all InnoDB tablespaces
NUMERIC_MIN_VALUE 4096
NUMERIC_MAX_VALUE 65536
NUMERIC_BLOCK_SIZE 0
@@ -1212,7 +1212,7 @@ SESSION_VALUE NULL
DEFAULT_VALUE 1000
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE BIGINT UNSIGNED
VARIABLE_COMMENT Number of UNDO log pages to purge in one batch from the history list.
VARIABLE_COMMENT Number of UNDO log pages to purge in one batch from the history list
NUMERIC_MIN_VALUE 1
NUMERIC_MAX_VALUE 5000
NUMERIC_BLOCK_SIZE 0
@@ -1248,7 +1248,7 @@ SESSION_VALUE NULL
DEFAULT_VALUE OFF
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE BOOLEAN
VARIABLE_COMMENT Whether to use read ahead for random access within an extent.
VARIABLE_COMMENT Whether to use read ahead for random access within an extent
NUMERIC_MIN_VALUE NULL
NUMERIC_MAX_VALUE NULL
NUMERIC_BLOCK_SIZE NULL
@@ -1260,7 +1260,7 @@ SESSION_VALUE NULL
DEFAULT_VALUE 56
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE BIGINT UNSIGNED
VARIABLE_COMMENT Number of pages that must be accessed sequentially for InnoDB to trigger a readahead.
VARIABLE_COMMENT Number of pages that must be accessed sequentially for InnoDB to trigger a readahead
NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 64
NUMERIC_BLOCK_SIZE 0
@@ -1272,7 +1272,7 @@ SESSION_VALUE NULL
DEFAULT_VALUE 4
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT Number of background read I/O threads in InnoDB.
VARIABLE_COMMENT Number of background read I/O threads in InnoDB
NUMERIC_MIN_VALUE 1
NUMERIC_MAX_VALUE 64
NUMERIC_BLOCK_SIZE 0
@@ -1320,7 +1320,7 @@ SESSION_VALUE NULL
DEFAULT_VALUE 0
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT An InnoDB page number.
VARIABLE_COMMENT An InnoDB page number
NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 4294967295
NUMERIC_BLOCK_SIZE 0
@@ -1332,7 +1332,7 @@ SESSION_VALUE OFF
DEFAULT_VALUE OFF
VARIABLE_SCOPE SESSION
VARIABLE_TYPE BOOLEAN
VARIABLE_COMMENT Use snapshot isolation (write-write conflict detection).
VARIABLE_COMMENT Use snapshot isolation (write-write conflict detection)
NUMERIC_MIN_VALUE NULL
NUMERIC_MAX_VALUE NULL
NUMERIC_BLOCK_SIZE NULL
@@ -1476,7 +1476,7 @@ SESSION_VALUE NULL
DEFAULT_VALUE OFF
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE BOOLEAN
VARIABLE_COMMENT Enable InnoDB monitor output to the error log.
VARIABLE_COMMENT Enable InnoDB monitor output to the error log
NUMERIC_MIN_VALUE NULL
NUMERIC_MAX_VALUE NULL
NUMERIC_BLOCK_SIZE NULL
@@ -1488,7 +1488,7 @@ SESSION_VALUE NULL
DEFAULT_VALUE OFF
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE BOOLEAN
VARIABLE_COMMENT Enable InnoDB lock monitor output to the error log. Requires innodb_status_output=ON.
VARIABLE_COMMENT Enable InnoDB lock monitor output to the error log. Requires innodb_status_output=ON
NUMERIC_MIN_VALUE NULL
NUMERIC_MAX_VALUE NULL
NUMERIC_BLOCK_SIZE NULL
@@ -1500,7 +1500,7 @@ SESSION_VALUE ON
DEFAULT_VALUE ON
VARIABLE_SCOPE SESSION
VARIABLE_TYPE BOOLEAN
VARIABLE_COMMENT Use strict mode when evaluating create options.
VARIABLE_COMMENT Use strict mode when evaluating create options
NUMERIC_MIN_VALUE NULL
NUMERIC_MAX_VALUE NULL
NUMERIC_BLOCK_SIZE NULL
@@ -1536,7 +1536,7 @@ SESSION_VALUE NULL
DEFAULT_VALUE ibtmp1:12M:autoextend
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE VARCHAR
VARIABLE_COMMENT Path to files and their sizes making temp-tablespace.
VARIABLE_COMMENT Path to files and their sizes making temp-tablespace
NUMERIC_MIN_VALUE NULL
NUMERIC_MAX_VALUE NULL
NUMERIC_BLOCK_SIZE NULL
@@ -1548,7 +1548,7 @@ SESSION_VALUE
DEFAULT_VALUE
VARIABLE_SCOPE SESSION
VARIABLE_TYPE VARCHAR
VARIABLE_COMMENT Directory for temporary non-tablespace files.
VARIABLE_COMMENT Directory for temporary non-tablespace files
NUMERIC_MIN_VALUE NULL
NUMERIC_MAX_VALUE NULL
NUMERIC_BLOCK_SIZE NULL
@@ -1572,7 +1572,7 @@ SESSION_VALUE NULL
DEFAULT_VALUE OFF
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE BOOLEAN
VARIABLE_COMMENT Pause actual purging any delete-marked records, but merely update the purge view. It is to create artificially the situation the purge view have been updated but the each purges were not done yet.
VARIABLE_COMMENT Pause actual purging any delete-marked records, but merely update the purge view. It is to create artificially the situation the purge view have been updated but the each purges were not done yet
NUMERIC_MIN_VALUE NULL
NUMERIC_MAX_VALUE NULL
NUMERIC_BLOCK_SIZE NULL
@@ -1596,7 +1596,7 @@ SESSION_VALUE NULL
DEFAULT_VALUE
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE VARCHAR
VARIABLE_COMMENT Directory where undo tablespace files live, this path can be absolute.
VARIABLE_COMMENT Directory where undo tablespace files live, this path can be absolute
NUMERIC_MIN_VALUE NULL
NUMERIC_MAX_VALUE NULL
NUMERIC_BLOCK_SIZE NULL
@@ -1608,7 +1608,7 @@ SESSION_VALUE NULL
DEFAULT_VALUE OFF
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE BOOLEAN
VARIABLE_COMMENT Enable or Disable Truncate of UNDO tablespace.
VARIABLE_COMMENT Enable or Disable Truncate of UNDO tablespace
NUMERIC_MIN_VALUE NULL
NUMERIC_MAX_VALUE NULL
NUMERIC_BLOCK_SIZE NULL
@@ -1620,7 +1620,7 @@ SESSION_VALUE NULL
DEFAULT_VALUE 3
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT Number of undo tablespaces to use.
VARIABLE_COMMENT Number of undo tablespaces to use
NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 127
NUMERIC_BLOCK_SIZE 0
@@ -1632,7 +1632,7 @@ SESSION_VALUE NULL
DEFAULT_VALUE ON
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE BOOLEAN
VARIABLE_COMMENT Enable atomic writes, instead of using the doublewrite buffer, for files on devices that supports atomic writes.
VARIABLE_COMMENT Enable atomic writes, instead of using the doublewrite buffer, for files on devices that supports atomic writes
NUMERIC_MIN_VALUE NULL
NUMERIC_MAX_VALUE NULL
NUMERIC_BLOCK_SIZE NULL
@@ -1644,7 +1644,7 @@ SESSION_VALUE NULL
DEFAULT_VALUE 4
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT Number of background write I/O threads in InnoDB.
VARIABLE_COMMENT Number of background write I/O threads in InnoDB
NUMERIC_MIN_VALUE 2
NUMERIC_MAX_VALUE 64
NUMERIC_BLOCK_SIZE 0

140
mysql-test/suite/sys_vars/r/sysvars_server_embedded,32bit.rdiff
View File

@@ -6,7 +6,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT UNSIGNED
+VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT Block size to be used for Aria index pages.
VARIABLE_COMMENT Block size to be used for Aria index pages
NUMERIC_MIN_VALUE 4096
NUMERIC_MAX_VALUE 32768
@@ -54,7 +54,7 @@
@@ -15,7 +15,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT UNSIGNED
+VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT Interval between tries to do an automatic checkpoints. In seconds; 0 means 'no automatic checkpoints' which makes sense only for testing.
VARIABLE_COMMENT Interval between tries to do an automatic checkpoints. In seconds; 0 means 'no automatic checkpoints' which makes sense only for testing
NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 4294967295
@@ -64,7 +64,7 @@
@@ -24,7 +24,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT UNSIGNED
+VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT Number of bytes that the transaction log has to grow between checkpoints before a new checkpoint is written to the log.
VARIABLE_COMMENT Number of bytes that the transaction log has to grow between checkpoints before a new checkpoint is written to the log
NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 4294967295
@@ -84,7 +84,7 @@
@@ -33,7 +33,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT UNSIGNED
+VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT Number of consecutive log recovery failures after which logs will be automatically deleted to cure the problem; 0 (the default) disables the feature.
VARIABLE_COMMENT Number of consecutive log recovery failures after which logs will be automatically deleted to cure the problem; 0 (the default) disables the feature
NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 255
@@ -104,7 +104,7 @@
@@ -60,7 +60,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT UNSIGNED
+VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT This characterizes the number of hits a hot block has to be untouched until it is considered aged enough to be downgraded to a warm block. This specifies the percentage ratio of that number of hits to the total number of blocks in the page cache.
VARIABLE_COMMENT This characterizes the number of hits a hot block has to be untouched until it is considered aged enough to be downgraded to a warm block. This specifies the percentage ratio of that number of hits to the total number of blocks in the page cache
NUMERIC_MIN_VALUE 100
-NUMERIC_MAX_VALUE 18446744073709551615
+NUMERIC_MAX_VALUE 4294967295
@@ -82,7 +82,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT UNSIGNED
+VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT Number of hash buckets for open and changed files. If you have a lot of Aria files open you should increase this for faster flush of changes. A good value is probably 1/10 of number of possible open Aria files.
VARIABLE_COMMENT Number of hash buckets for open and changed files. If you have a lot of Aria files open you should increase this for faster flush of changes. A good value is probably 1/10 of number of possible open Aria files
NUMERIC_MIN_VALUE 128
NUMERIC_MAX_VALUE 16384
@@ -214,7 +214,7 @@
@@ -91,12 +91,12 @@
VARIABLE_SCOPE SESSION
-VARIABLE_TYPE BIGINT UNSIGNED
+VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT Number of threads to use when repairing Aria tables. The value of 1 disables parallel repair.
VARIABLE_COMMENT Number of threads to use when repairing Aria tables. The value of 1 disables parallel repair
NUMERIC_MIN_VALUE 1
NUMERIC_MAX_VALUE 128
@@ -227,7 +227,7 @@
VARIABLE_TYPE BIGINT UNSIGNED
VARIABLE_COMMENT The buffer that is allocated when sorting the index when doing a REPAIR or when creating indexes with CREATE INDEX or ALTER TABLE.
VARIABLE_COMMENT The buffer that is allocated when sorting the index when doing a REPAIR or when creating indexes with CREATE INDEX or ALTER TABLE
NUMERIC_MIN_VALUE 16376
-NUMERIC_MAX_VALUE 1152921504606846975
+NUMERIC_MAX_VALUE 268435455
@@ -145,7 +145,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT UNSIGNED
+VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT If non-zero, binlog write will wait at most binlog_commit_wait_usec microseconds for at least this many commits to queue up for group commit to the binlog. This can reduce I/O on the binlog and provide increased opportunity for parallel apply on the slave, but too high a value will decrease commit throughput.
VARIABLE_COMMENT If non-zero, binlog write will wait at most binlog_commit_wait_usec microseconds for at least this many commits to queue up for group commit to the binlog. This can reduce I/O on the binlog and provide increased opportunity for parallel apply on the slave, but too high a value will decrease commit throughput
NUMERIC_MIN_VALUE 0
-NUMERIC_MAX_VALUE 18446744073709551615
+NUMERIC_MAX_VALUE 4294967295
@@ -157,7 +157,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT UNSIGNED
+VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT Maximum time, in microseconds, to wait for more commits to queue up for binlog group commit. Only takes effect if the value of binlog_commit_wait_count is non-zero.
VARIABLE_COMMENT Maximum time, in microseconds, to wait for more commits to queue up for binlog group commit. Only takes effect if the value of binlog_commit_wait_count is non-zero
NUMERIC_MIN_VALUE 0
-NUMERIC_MAX_VALUE 18446744073709551615
+NUMERIC_MAX_VALUE 4294967295
@@ -170,7 +170,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT UNSIGNED
+VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT If non-zero, binary logs will be purged after binlog_expire_logs_seconds seconds; It and expire_logs_days are linked, such that changes in one are converted into the other. Possible purges happen at startup and at binary log rotation.
VARIABLE_COMMENT If non-zero, binary logs will be purged after binlog_expire_logs_seconds seconds; It and expire_logs_days are linked, such that changes in one are converted into the other. Possible purges happen at startup and at binary log rotation
NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 8553600
@@ -417,7 +417,7 @@
@@ -184,7 +184,7 @@
READ_ONLY NO
@@ -507,7 +507,7 @@
VARIABLE_TYPE BIGINT UNSIGNED
VARIABLE_COMMENT The size of the statement cache for updates to non-transactional engines for the binary log. If you often use statements updating a great number of rows, you can increase this to get more performance.
VARIABLE_COMMENT The size of the statement cache for updates to non-transactional engines for the binary log. If you often use statements updating a great number of rows, you can increase this to get more performance
NUMERIC_MIN_VALUE 4096
-NUMERIC_MAX_VALUE 18446744073709551615
+NUMERIC_MAX_VALUE 4294967295
@@ -260,7 +260,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT UNSIGNED
+VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT After inserting delayed_insert_limit rows, the INSERT DELAYED handler will check if there are any SELECT statements pending. If so, it allows these to execute before continuing.
VARIABLE_COMMENT After inserting delayed_insert_limit rows, the INSERT DELAYED handler will check if there are any SELECT statements pending. If so, it allows these to execute before continuing
NUMERIC_MIN_VALUE 1
NUMERIC_MAX_VALUE 4294967295
@@ -854,7 +854,7 @@
@@ -341,7 +341,7 @@
VARIABLE_SCOPE SESSION
-VARIABLE_TYPE BIGINT UNSIGNED
+VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT Number of bytes used for a histogram. If set to 0, no histograms are created by ANALYZE.
VARIABLE_COMMENT Number of bytes used for a histogram. If set to 0, no histograms are created by ANALYZE
NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 255
@@ -1284,7 +1284,7 @@
@@ -350,7 +350,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT UNSIGNED
+VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT How many host names should be cached to avoid resolving.
VARIABLE_COMMENT How many host names should be cached to avoid resolving
NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 65536
@@ -1394,7 +1394,7 @@
@@ -395,7 +395,7 @@
VARIABLE_SCOPE SESSION
-VARIABLE_TYPE BIGINT UNSIGNED
+VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT Timeout in seconds to wait for a lock before returning an error.
VARIABLE_COMMENT Timeout in seconds to wait for a lock before returning an error
NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 31536000
@@ -1744,7 +1744,7 @@
@@ -457,7 +457,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT UNSIGNED
+VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT Binary log will be rotated automatically when the size exceeds this value.
VARIABLE_COMMENT Binary log will be rotated automatically when the size exceeds this value
NUMERIC_MIN_VALUE 4096
NUMERIC_MAX_VALUE 1073741824
@@ -1907,7 +1907,7 @@
@@ -720,7 +720,7 @@
VARIABLE_SCOPE SESSION
-VARIABLE_TYPE BIGINT UNSIGNED
+VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT Unused, will be removed.
VARIABLE_COMMENT Unused
NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 2
@@ -2384,7 +2384,7 @@
@@ -729,7 +729,7 @@
VARIABLE_SCOPE SESSION
-VARIABLE_TYPE BIGINT UNSIGNED
+VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT If the optimizer needs to enumerate join prefix of this size or larger, then it will try aggressively prune away the search space.
VARIABLE_COMMENT If the optimizer needs to enumerate join prefix of this size or larger, then it will try aggressively prune away the search space
NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 62
@@ -2444,7 +2444,7 @@
@@ -738,7 +738,7 @@
VARIABLE_SCOPE SESSION
-VARIABLE_TYPE BIGINT UNSIGNED
+VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT The maximum number of SEL_ARG objects created when optimizing a range. If more objects would be needed, the range will not be used by the optimizer.
VARIABLE_COMMENT The maximum number of SEL_ARG objects created when optimizing a range. If more objects would be needed, the range will not be used by the optimizer
NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 4294967295
@@ -2454,7 +2454,7 @@
@@ -765,7 +765,7 @@
VARIABLE_SCOPE SESSION
-VARIABLE_TYPE BIGINT UNSIGNED
+VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT Maximum depth of search performed by the query optimizer. Values larger than the number of relations in a query result in better query plans, but take longer to compile a query. Values smaller than the number of tables in a relation result in faster optimization, but may produce very bad query plans. If set to 0, the system will automatically pick a reasonable value.
VARIABLE_COMMENT Maximum depth of search performed by the query optimizer. Values larger than the number of relations in a query result in better query plans, but take longer to compile a query. Values smaller than the number of tables in a relation result in faster optimization, but may produce very bad query plans. If set to 0, the system will automatically pick a reasonable value
NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 62
@@ -2544,7 +2544,7 @@
@@ -804,7 +804,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT
+VARIABLE_TYPE INT
VARIABLE_COMMENT Maximum number of instrumented user@host accounts. Use 0 to disable, -1 for automated sizing.
VARIABLE_COMMENT Maximum number of instrumented user@host accounts. Use 0 to disable, -1 for automated sizing
NUMERIC_MIN_VALUE -1
NUMERIC_MAX_VALUE 1048576
@@ -2624,7 +2624,7 @@
@@ -813,7 +813,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT
+VARIABLE_TYPE INT
VARIABLE_COMMENT Size of the statement digest. Use 0 to disable, -1 for automated sizing.
VARIABLE_COMMENT Size of the statement digest. Use 0 to disable, -1 for automated sizing
NUMERIC_MIN_VALUE -1
NUMERIC_MAX_VALUE 1048576
@@ -2634,7 +2634,7 @@
@@ -822,7 +822,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT
+VARIABLE_TYPE INT
VARIABLE_COMMENT Number of rows in EVENTS_STAGES_HISTORY_LONG. Use 0 to disable, -1 for automated sizing.
VARIABLE_COMMENT Number of rows in EVENTS_STAGES_HISTORY_LONG. Use 0 to disable, -1 for automated sizing
NUMERIC_MIN_VALUE -1
NUMERIC_MAX_VALUE 1048576
@@ -2644,7 +2644,7 @@
@@ -831,7 +831,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT
+VARIABLE_TYPE INT
VARIABLE_COMMENT Number of rows per thread in EVENTS_STAGES_HISTORY. Use 0 to disable, -1 for automated sizing.
VARIABLE_COMMENT Number of rows per thread in EVENTS_STAGES_HISTORY. Use 0 to disable, -1 for automated sizing
NUMERIC_MIN_VALUE -1
NUMERIC_MAX_VALUE 1024
@@ -2654,7 +2654,7 @@
@@ -840,7 +840,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT
+VARIABLE_TYPE INT
VARIABLE_COMMENT Number of rows in EVENTS_STATEMENTS_HISTORY_LONG. Use 0 to disable, -1 for automated sizing.
VARIABLE_COMMENT Number of rows in EVENTS_STATEMENTS_HISTORY_LONG. Use 0 to disable, -1 for automated sizing
NUMERIC_MIN_VALUE -1
NUMERIC_MAX_VALUE 1048576
@@ -2664,7 +2664,7 @@
@@ -849,7 +849,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT
+VARIABLE_TYPE INT
VARIABLE_COMMENT Number of rows per thread in EVENTS_STATEMENTS_HISTORY. Use 0 to disable, -1 for automated sizing.
VARIABLE_COMMENT Number of rows per thread in EVENTS_STATEMENTS_HISTORY. Use 0 to disable, -1 for automated sizing
NUMERIC_MIN_VALUE -1
NUMERIC_MAX_VALUE 1024
@@ -2674,7 +2674,7 @@
@@ -858,7 +858,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT
+VARIABLE_TYPE INT
VARIABLE_COMMENT Number of rows in EVENTS_TRANSACTIONS_HISTORY_LONG. Use 0 to disable, -1 for automated sizing.
VARIABLE_COMMENT Number of rows in EVENTS_TRANSACTIONS_HISTORY_LONG. Use 0 to disable, -1 for automated sizing
NUMERIC_MIN_VALUE -1
NUMERIC_MAX_VALUE 1048576
@@ -2684,7 +2684,7 @@
@@ -867,7 +867,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT
+VARIABLE_TYPE INT
VARIABLE_COMMENT Number of rows per thread in EVENTS_TRANSACTIONS_HISTORY. Use 0 to disable, -1 for automated sizing.
VARIABLE_COMMENT Number of rows per thread in EVENTS_TRANSACTIONS_HISTORY. Use 0 to disable, -1 for automated sizing
NUMERIC_MIN_VALUE -1
NUMERIC_MAX_VALUE 1024
@@ -2694,7 +2694,7 @@
@@ -876,7 +876,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT
+VARIABLE_TYPE INT
VARIABLE_COMMENT Number of rows in EVENTS_WAITS_HISTORY_LONG. Use 0 to disable, -1 for automated sizing.
VARIABLE_COMMENT Number of rows in EVENTS_WAITS_HISTORY_LONG. Use 0 to disable, -1 for automated sizing
NUMERIC_MIN_VALUE -1
NUMERIC_MAX_VALUE 1048576
@@ -2704,7 +2704,7 @@
@@ -885,7 +885,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT
+VARIABLE_TYPE INT
VARIABLE_COMMENT Number of rows per thread in EVENTS_WAITS_HISTORY. Use 0 to disable, -1 for automated sizing.
VARIABLE_COMMENT Number of rows per thread in EVENTS_WAITS_HISTORY. Use 0 to disable, -1 for automated sizing
NUMERIC_MIN_VALUE -1
NUMERIC_MAX_VALUE 1024
@@ -2714,7 +2714,7 @@
@@ -894,7 +894,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT
+VARIABLE_TYPE INT
VARIABLE_COMMENT Maximum number of instrumented hosts. Use 0 to disable, -1 for automated sizing.
VARIABLE_COMMENT Maximum number of instrumented hosts. Use 0 to disable, -1 for automated sizing
NUMERIC_MIN_VALUE -1
NUMERIC_MAX_VALUE 1048576
@@ -2724,7 +2724,7 @@
@@ -903,7 +903,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT UNSIGNED
+VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT Maximum number of condition instruments.
VARIABLE_COMMENT Maximum number of condition instruments
NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 256
@@ -2734,7 +2734,7 @@
@@ -912,7 +912,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT
+VARIABLE_TYPE INT
VARIABLE_COMMENT Maximum number of instrumented condition objects. Use 0 to disable, -1 for automated sizing.
VARIABLE_COMMENT Maximum number of instrumented condition objects. Use 0 to disable, -1 for automated sizing
NUMERIC_MIN_VALUE -1
NUMERIC_MAX_VALUE 1048576
@@ -2744,7 +2744,7 @@
@@ -921,7 +921,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT
+VARIABLE_TYPE INT
VARIABLE_COMMENT Maximum length considered for digest text, when stored in performance_schema tables.
VARIABLE_COMMENT Maximum length considered for digest text, when stored in performance_schema tables
NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 1048576
@@ -2754,7 +2754,7 @@
@@ -930,7 +930,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT UNSIGNED
+VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT Maximum number of file instruments.
VARIABLE_COMMENT Maximum number of file instruments
NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 256
@@ -2764,7 +2764,7 @@
@@ -939,7 +939,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT UNSIGNED
+VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT Maximum number of opened instrumented files.
VARIABLE_COMMENT Maximum number of opened instrumented files
NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 1048576
@@ -2774,7 +2774,7 @@
@@ -948,7 +948,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT
+VARIABLE_TYPE INT
VARIABLE_COMMENT Maximum number of instrumented files. Use 0 to disable, -1 for automated sizing.
VARIABLE_COMMENT Maximum number of instrumented files. Use 0 to disable, -1 for automated sizing
NUMERIC_MIN_VALUE -1
NUMERIC_MAX_VALUE 1048576
@@ -2784,7 +2784,7 @@
@@ -957,7 +957,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT
+VARIABLE_TYPE INT
VARIABLE_COMMENT Maximum number of index statistics for instrumented tables. Use 0 to disable, -1 for automated scaling.
VARIABLE_COMMENT Maximum number of index statistics for instrumented tables. Use 0 to disable, -1 for automated scaling
NUMERIC_MIN_VALUE -1
NUMERIC_MAX_VALUE 1048576
@@ -2794,7 +2794,7 @@
@@ -966,7 +966,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT UNSIGNED
+VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT Maximum number of memory pool instruments.
VARIABLE_COMMENT Maximum number of memory pool instruments
NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 1024
@@ -2804,7 +2804,7 @@
@@ -975,7 +975,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT
+VARIABLE_TYPE INT
VARIABLE_COMMENT Maximum number of metadata locks. Use 0 to disable, -1 for automated scaling.
VARIABLE_COMMENT Maximum number of metadata locks. Use 0 to disable, -1 for automated scaling
NUMERIC_MIN_VALUE -1
NUMERIC_MAX_VALUE 104857600
@@ -2814,7 +2814,7 @@
@@ -984,7 +984,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT UNSIGNED
+VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT Maximum number of mutex instruments.
VARIABLE_COMMENT Maximum number of mutex instruments
NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 256
@@ -2824,7 +2824,7 @@
@@ -993,7 +993,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT
+VARIABLE_TYPE INT
VARIABLE_COMMENT Maximum number of instrumented MUTEX objects. Use 0 to disable, -1 for automated sizing.
VARIABLE_COMMENT Maximum number of instrumented MUTEX objects. Use 0 to disable, -1 for automated sizing
NUMERIC_MIN_VALUE -1
NUMERIC_MAX_VALUE 104857600
@@ -2834,7 +2834,7 @@
@@ -1002,7 +1002,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT
+VARIABLE_TYPE INT
VARIABLE_COMMENT Maximum number of instrumented prepared statements. Use 0 to disable, -1 for automated scaling.
VARIABLE_COMMENT Maximum number of instrumented prepared statements. Use 0 to disable, -1 for automated scaling
NUMERIC_MIN_VALUE -1
NUMERIC_MAX_VALUE 1048576
@@ -2844,7 +2844,7 @@
@@ -1011,7 +1011,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT
+VARIABLE_TYPE INT
VARIABLE_COMMENT Maximum number of instrumented programs. Use 0 to disable, -1 for automated scaling.
VARIABLE_COMMENT Maximum number of instrumented programs. Use 0 to disable, -1 for automated scaling
NUMERIC_MIN_VALUE -1
NUMERIC_MAX_VALUE 1048576
@@ -2854,7 +2854,7 @@
@@ -1020,7 +1020,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT UNSIGNED
+VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT Maximum number of rwlock instruments.
VARIABLE_COMMENT Maximum number of rwlock instruments
NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 256
@@ -2864,7 +2864,7 @@
@@ -1029,7 +1029,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT
+VARIABLE_TYPE INT
VARIABLE_COMMENT Maximum number of instrumented RWLOCK objects. Use 0 to disable, -1 for automated sizing.
VARIABLE_COMMENT Maximum number of instrumented RWLOCK objects. Use 0 to disable, -1 for automated sizing
NUMERIC_MIN_VALUE -1
NUMERIC_MAX_VALUE 104857600
@@ -2874,7 +2874,7 @@
@@ -1038,7 +1038,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT UNSIGNED
+VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT Maximum number of socket instruments.
VARIABLE_COMMENT Maximum number of socket instruments
NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 256
@@ -2884,7 +2884,7 @@
@@ -1047,7 +1047,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT
+VARIABLE_TYPE INT
VARIABLE_COMMENT Maximum number of opened instrumented sockets. Use 0 to disable, -1 for automated sizing.
VARIABLE_COMMENT Maximum number of opened instrumented sockets. Use 0 to disable, -1 for automated sizing
NUMERIC_MIN_VALUE -1
NUMERIC_MAX_VALUE 1048576
@@ -2894,7 +2894,7 @@
@@ -1056,7 +1056,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT
+VARIABLE_TYPE INT
VARIABLE_COMMENT Maximum length of displayed sql text.
VARIABLE_COMMENT Maximum length of displayed sql text
NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 1048576
@@ -2904,7 +2904,7 @@
@@ -1065,7 +1065,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT UNSIGNED
+VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT Maximum number of stage instruments.
VARIABLE_COMMENT Maximum number of stage instruments
NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 256
@@ -2914,7 +2914,7 @@
@@ -1074,7 +1074,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT UNSIGNED
+VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT Maximum number of statement instruments.
VARIABLE_COMMENT Maximum number of statement instruments
NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 256
@@ -2924,7 +2924,7 @@
@@ -1083,7 +1083,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT UNSIGNED
+VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT Number of rows per thread in EVENTS_STATEMENTS_CURRENT.
VARIABLE_COMMENT Number of rows per thread in EVENTS_STATEMENTS_CURRENT
NUMERIC_MIN_VALUE 1
NUMERIC_MAX_VALUE 256
@@ -2934,7 +2934,7 @@
@@ -1092,7 +1092,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT
+VARIABLE_TYPE INT
VARIABLE_COMMENT Maximum number of opened instrumented tables. Use 0 to disable, -1 for automated sizing.
VARIABLE_COMMENT Maximum number of opened instrumented tables. Use 0 to disable, -1 for automated sizing
NUMERIC_MIN_VALUE -1
NUMERIC_MAX_VALUE 1048576
@@ -2944,7 +2944,7 @@
@@ -1101,7 +1101,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT
+VARIABLE_TYPE INT
VARIABLE_COMMENT Maximum number of instrumented tables. Use 0 to disable, -1 for automated sizing.
VARIABLE_COMMENT Maximum number of instrumented tables. Use 0 to disable, -1 for automated sizing
NUMERIC_MIN_VALUE -1
NUMERIC_MAX_VALUE 1048576
@@ -2954,7 +2954,7 @@
@@ -1110,7 +1110,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT
+VARIABLE_TYPE INT
VARIABLE_COMMENT Maximum number of lock statistics for instrumented tables. Use 0 to disable, -1 for automated scaling.
VARIABLE_COMMENT Maximum number of lock statistics for instrumented tables. Use 0 to disable, -1 for automated scaling
NUMERIC_MIN_VALUE -1
NUMERIC_MAX_VALUE 1048576
@@ -2964,7 +2964,7 @@
@@ -1119,7 +1119,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT UNSIGNED
+VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT Maximum number of thread instruments.
VARIABLE_COMMENT Maximum number of thread instruments
NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 256
@@ -2974,7 +2974,7 @@
@@ -1128,7 +1128,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT
+VARIABLE_TYPE INT
VARIABLE_COMMENT Maximum number of instrumented threads. Use 0 to disable, -1 for automated sizing.
VARIABLE_COMMENT Maximum number of instrumented threads. Use 0 to disable, -1 for automated sizing
NUMERIC_MIN_VALUE -1
NUMERIC_MAX_VALUE 1048576
@@ -2984,7 +2984,7 @@
@@ -1137,7 +1137,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT
+VARIABLE_TYPE INT
VARIABLE_COMMENT Size of session attribute string buffer per thread. Use 0 to disable, -1 for automated sizing.
VARIABLE_COMMENT Size of session attribute string buffer per thread. Use 0 to disable, -1 for automated sizing
NUMERIC_MIN_VALUE -1
NUMERIC_MAX_VALUE 1048576
@@ -2994,7 +2994,7 @@
@@ -1146,7 +1146,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT
+VARIABLE_TYPE INT
VARIABLE_COMMENT Maximum number of rows in SETUP_ACTORS.
VARIABLE_COMMENT Maximum number of rows in SETUP_ACTORS
NUMERIC_MIN_VALUE -1
NUMERIC_MAX_VALUE 1024
@@ -3004,7 +3004,7 @@
@@ -1155,7 +1155,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT
+VARIABLE_TYPE INT
VARIABLE_COMMENT Maximum number of rows in SETUP_OBJECTS.
VARIABLE_COMMENT Maximum number of rows in SETUP_OBJECTS
NUMERIC_MIN_VALUE -1
NUMERIC_MAX_VALUE 1048576
@@ -3014,7 +3014,7 @@
@@ -1164,7 +1164,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT
+VARIABLE_TYPE INT
VARIABLE_COMMENT Maximum number of instrumented users. Use 0 to disable, -1 for automated sizing.
VARIABLE_COMMENT Maximum number of instrumented users. Use 0 to disable, -1 for automated sizing
NUMERIC_MIN_VALUE -1
NUMERIC_MAX_VALUE 1048576
@@ -3064,7 +3064,7 @@
@@ -1182,7 +1182,7 @@
VARIABLE_SCOPE SESSION
-VARIABLE_TYPE BIGINT UNSIGNED
+VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT Number of statements about which profiling information is maintained. If set to 0, no profiles are stored. See SHOW PROFILES.
VARIABLE_COMMENT Number of statements about which profiling information is maintained. If set to 0, no profiles are stored. See SHOW PROFILES
NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 100
@@ -3094,7 +3094,7 @@
@@ -1191,7 +1191,7 @@
VARIABLE_SCOPE SESSION
-VARIABLE_TYPE BIGINT UNSIGNED
+VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT Seconds between sending progress reports to the client for time-consuming statements. Set to 0 to disable progress reporting.
VARIABLE_COMMENT Seconds between sending progress reports to the client for time-consuming statements. Set to 0 to disable progress reporting
NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 4294967295
@@ -3154,7 +3154,7 @@
@@ -1311,7 +1311,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT UNSIGNED
+VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT The maximum packet length to sent successfully from the master to slave.
VARIABLE_COMMENT The maximum packet length to sent successfully from the master to slave
NUMERIC_MIN_VALUE 1024
NUMERIC_MAX_VALUE 1073741824
@@ -3444,7 +3444,7 @@
@@ -1338,7 +1338,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT UNSIGNED
+VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT The soft upper limit for number of cached stored routines for one connection.
VARIABLE_COMMENT The soft upper limit for number of cached stored routines for one connection
NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 524288
@@ -3794,7 +3794,7 @@
@@ -1370,7 +1370,7 @@
NUMERIC_MAX_VALUE 16384
@@ -3937,7 +3937,7 @@
VARIABLE_TYPE BIGINT UNSIGNED
VARIABLE_COMMENT Max size for data for an internal temporary on-disk MyISAM or Aria table.
VARIABLE_COMMENT Max size for data for an internal temporary on-disk MyISAM or Aria table
NUMERIC_MIN_VALUE 1024
-NUMERIC_MAX_VALUE 18446744073709551615
+NUMERIC_MAX_VALUE 4294967295
@@ -1379,7 +1379,7 @@
READ_ONLY NO
@@ -3947,7 +3947,7 @@
VARIABLE_TYPE BIGINT UNSIGNED
VARIABLE_COMMENT If an internal in-memory temporary table exceeds this size, MariaDB will automatically convert it to an on-disk MyISAM or Aria table. Same as tmp_table_size.
VARIABLE_COMMENT If an internal in-memory temporary table exceeds this size, MariaDB will automatically convert it to an on-disk MyISAM or Aria table. Same as tmp_table_size
NUMERIC_MIN_VALUE 0
-NUMERIC_MAX_VALUE 18446744073709551615
+NUMERIC_MAX_VALUE 4294967295
@@ -1388,7 +1388,7 @@
READ_ONLY NO
@@ -3957,14 +3957,14 @@
VARIABLE_TYPE BIGINT UNSIGNED
VARIABLE_COMMENT Alias for tmp_memory_table_size. If an internal in-memory temporary table exceeds this size, MariaDB will automatically convert it to an on-disk MyISAM or Aria table.
VARIABLE_COMMENT Alias for tmp_memory_table_size. If an internal in-memory temporary table exceeds this size, MariaDB will automatically convert it to an on-disk MyISAM or Aria table
NUMERIC_MIN_VALUE 0
-NUMERIC_MAX_VALUE 18446744073709551615
+NUMERIC_MAX_VALUE 4294967295
@@ -1427,6 +1427,6 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT UNSIGNED
+VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT Size of transaction coordinator log.
VARIABLE_COMMENT Size of transaction coordinator log
ENUM_VALUE_LIST NULL
READ_ONLY YES

322
mysql-test/suite/sys_vars/r/sysvars_server_embedded.result
View File

File diff suppressed because it is too large Load Diff

150
mysql-test/suite/sys_vars/r/sysvars_server_notembedded,32bit.rdiff
View File

@@ -6,7 +6,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT UNSIGNED
+VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT Block size to be used for Aria index pages.
VARIABLE_COMMENT Block size to be used for Aria index pages
NUMERIC_MIN_VALUE 4096
NUMERIC_MAX_VALUE 32768
@@ -54,7 +54,7 @@
@@ -15,7 +15,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT UNSIGNED
+VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT Interval between tries to do an automatic checkpoints. In seconds; 0 means 'no automatic checkpoints' which makes sense only for testing.
VARIABLE_COMMENT Interval between tries to do an automatic checkpoints. In seconds; 0 means 'no automatic checkpoints' which makes sense only for testing
NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 4294967295
@@ -64,7 +64,7 @@
@@ -24,7 +24,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT UNSIGNED
+VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT Number of bytes that the transaction log has to grow between checkpoints before a new checkpoint is written to the log.
VARIABLE_COMMENT Number of bytes that the transaction log has to grow between checkpoints before a new checkpoint is written to the log
NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 4294967295
@@ -84,7 +84,7 @@
@@ -33,7 +33,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT UNSIGNED
+VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT Number of consecutive log recovery failures after which logs will be automatically deleted to cure the problem; 0 (the default) disables the feature.
VARIABLE_COMMENT Number of consecutive log recovery failures after which logs will be automatically deleted to cure the problem; 0 (the default) disables the feature
NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 255
@@ -104,7 +104,7 @@
@@ -60,7 +60,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT UNSIGNED
+VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT This characterizes the number of hits a hot block has to be untouched until it is considered aged enough to be downgraded to a warm block. This specifies the percentage ratio of that number of hits to the total number of blocks in the page cache.
VARIABLE_COMMENT This characterizes the number of hits a hot block has to be untouched until it is considered aged enough to be downgraded to a warm block. This specifies the percentage ratio of that number of hits to the total number of blocks in the page cache
NUMERIC_MIN_VALUE 100
-NUMERIC_MAX_VALUE 18446744073709551615
+NUMERIC_MAX_VALUE 4294967295
@@ -82,7 +82,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT UNSIGNED
+VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT Number of hash buckets for open and changed files. If you have a lot of Aria files open you should increase this for faster flush of changes. A good value is probably 1/10 of number of possible open Aria files.
VARIABLE_COMMENT Number of hash buckets for open and changed files. If you have a lot of Aria files open you should increase this for faster flush of changes. A good value is probably 1/10 of number of possible open Aria files
NUMERIC_MIN_VALUE 128
NUMERIC_MAX_VALUE 16384
@@ -214,7 +214,7 @@
@@ -91,12 +91,12 @@
VARIABLE_SCOPE SESSION
-VARIABLE_TYPE BIGINT UNSIGNED
+VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT Number of threads to use when repairing Aria tables. The value of 1 disables parallel repair.
VARIABLE_COMMENT Number of threads to use when repairing Aria tables. The value of 1 disables parallel repair
NUMERIC_MIN_VALUE 1
NUMERIC_MAX_VALUE 128
@@ -227,7 +227,7 @@
VARIABLE_TYPE BIGINT UNSIGNED
VARIABLE_COMMENT The buffer that is allocated when sorting the index when doing a REPAIR or when creating indexes with CREATE INDEX or ALTER TABLE.
VARIABLE_COMMENT The buffer that is allocated when sorting the index when doing a REPAIR or when creating indexes with CREATE INDEX or ALTER TABLE
NUMERIC_MIN_VALUE 16376
-NUMERIC_MAX_VALUE 1152921504606846975
+NUMERIC_MAX_VALUE 268435455
@@ -145,7 +145,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT UNSIGNED
+VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT If non-zero, binlog write will wait at most binlog_commit_wait_usec microseconds for at least this many commits to queue up for group commit to the binlog. This can reduce I/O on the binlog and provide increased opportunity for parallel apply on the slave, but too high a value will decrease commit throughput.
VARIABLE_COMMENT If non-zero, binlog write will wait at most binlog_commit_wait_usec microseconds for at least this many commits to queue up for group commit to the binlog. This can reduce I/O on the binlog and provide increased opportunity for parallel apply on the slave, but too high a value will decrease commit throughput
NUMERIC_MIN_VALUE 0
-NUMERIC_MAX_VALUE 18446744073709551615
+NUMERIC_MAX_VALUE 4294967295
@@ -157,7 +157,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT UNSIGNED
+VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT Maximum time, in microseconds, to wait for more commits to queue up for binlog group commit. Only takes effect if the value of binlog_commit_wait_count is non-zero.
VARIABLE_COMMENT Maximum time, in microseconds, to wait for more commits to queue up for binlog group commit. Only takes effect if the value of binlog_commit_wait_count is non-zero
NUMERIC_MIN_VALUE 0
-NUMERIC_MAX_VALUE 18446744073709551615
+NUMERIC_MAX_VALUE 4294967295
@@ -170,7 +170,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT UNSIGNED
+VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT If non-zero, binary logs will be purged after binlog_expire_logs_seconds seconds; It and expire_logs_days are linked, such that changes in one are converted into the other. Possible purges happen at startup and at binary log rotation.
VARIABLE_COMMENT If non-zero, binary logs will be purged after binlog_expire_logs_seconds seconds; It and expire_logs_days are linked, such that changes in one are converted into the other. Possible purges happen at startup and at binary log rotation
NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 8553600
@@ -437,7 +437,7 @@
@@ -188,12 +188,12 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT UNSIGNED
+VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT The maximum size of a row-based binary log event in bytes. Rows will be grouped into events smaller than this size if possible. The value has to be a multiple of 256.
VARIABLE_COMMENT The maximum size of a row-based binary log event in bytes. Rows will be grouped into events smaller than this size if possible. The value has to be a multiple of 256
NUMERIC_MIN_VALUE 256
NUMERIC_MAX_VALUE 4294967040
@@ -557,7 +557,7 @@
VARIABLE_TYPE BIGINT UNSIGNED
VARIABLE_COMMENT The size of the statement cache for updates to non-transactional engines for the binary log. If you often use statements updating a great number of rows, you can increase this to get more performance.
VARIABLE_COMMENT The size of the statement cache for updates to non-transactional engines for the binary log. If you often use statements updating a great number of rows, you can increase this to get more performance
NUMERIC_MIN_VALUE 4096
-NUMERIC_MAX_VALUE 18446744073709551615
+NUMERIC_MAX_VALUE 4294967295
@@ -269,7 +269,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT UNSIGNED
+VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT After inserting delayed_insert_limit rows, the INSERT DELAYED handler will check if there are any SELECT statements pending. If so, it allows these to execute before continuing.
VARIABLE_COMMENT After inserting delayed_insert_limit rows, the INSERT DELAYED handler will check if there are any SELECT statements pending. If so, it allows these to execute before continuing
NUMERIC_MIN_VALUE 1
NUMERIC_MAX_VALUE 4294967295
@@ -914,7 +914,7 @@
@@ -350,7 +350,7 @@
VARIABLE_SCOPE SESSION
-VARIABLE_TYPE BIGINT UNSIGNED
+VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT Number of bytes used for a histogram. If set to 0, no histograms are created by ANALYZE.
VARIABLE_COMMENT Number of bytes used for a histogram. If set to 0, no histograms are created by ANALYZE
NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 255
@@ -1434,7 +1434,7 @@
@@ -359,7 +359,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT UNSIGNED
+VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT How many host names should be cached to avoid resolving.
VARIABLE_COMMENT How many host names should be cached to avoid resolving
NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 65536
@@ -1544,7 +1544,7 @@
@@ -404,7 +404,7 @@
VARIABLE_SCOPE SESSION
-VARIABLE_TYPE BIGINT UNSIGNED
+VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT Timeout in seconds to wait for a lock before returning an error.
VARIABLE_COMMENT Timeout in seconds to wait for a lock before returning an error
NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 31536000
@@ -1934,7 +1934,7 @@
@@ -466,7 +466,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT UNSIGNED
+VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT Binary log will be rotated automatically when the size exceeds this value.
VARIABLE_COMMENT Binary log will be rotated automatically when the size exceeds this value
NUMERIC_MIN_VALUE 4096
NUMERIC_MAX_VALUE 1073741824
@@ -2107,7 +2107,7 @@
@@ -729,7 +729,7 @@
VARIABLE_SCOPE SESSION
-VARIABLE_TYPE BIGINT UNSIGNED
+VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT Unused, will be removed.
VARIABLE_COMMENT Unused
NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 2
@@ -2594,7 +2594,7 @@
@@ -738,7 +738,7 @@
VARIABLE_SCOPE SESSION
-VARIABLE_TYPE BIGINT UNSIGNED
+VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT If the optimizer needs to enumerate join prefix of this size or larger, then it will try aggressively prune away the search space.
VARIABLE_COMMENT If the optimizer needs to enumerate join prefix of this size or larger, then it will try aggressively prune away the search space
NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 62
@@ -2654,7 +2654,7 @@
@@ -747,7 +747,7 @@
VARIABLE_SCOPE SESSION
-VARIABLE_TYPE BIGINT UNSIGNED
+VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT The maximum number of SEL_ARG objects created when optimizing a range. If more objects would be needed, the range will not be used by the optimizer.
VARIABLE_COMMENT The maximum number of SEL_ARG objects created when optimizing a range. If more objects would be needed, the range will not be used by the optimizer
NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 4294967295
@@ -2664,7 +2664,7 @@
@@ -774,7 +774,7 @@
VARIABLE_SCOPE SESSION
-VARIABLE_TYPE BIGINT UNSIGNED
+VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT Maximum depth of search performed by the query optimizer. Values larger than the number of relations in a query result in better query plans, but take longer to compile a query. Values smaller than the number of tables in a relation result in faster optimization, but may produce very bad query plans. If set to 0, the system will automatically pick a reasonable value.
VARIABLE_COMMENT Maximum depth of search performed by the query optimizer. Values larger than the number of relations in a query result in better query plans, but take longer to compile a query. Values smaller than the number of tables in a relation result in faster optimization, but may produce very bad query plans. If set to 0, the system will automatically pick a reasonable value
NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 62
@@ -2754,7 +2754,7 @@
@@ -813,7 +813,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT
+VARIABLE_TYPE INT
VARIABLE_COMMENT Maximum number of instrumented user@host accounts. Use 0 to disable, -1 for automated sizing.
VARIABLE_COMMENT Maximum number of instrumented user@host accounts. Use 0 to disable, -1 for automated sizing
NUMERIC_MIN_VALUE -1
NUMERIC_MAX_VALUE 1048576
@@ -2834,7 +2834,7 @@
@@ -822,7 +822,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT
+VARIABLE_TYPE INT
VARIABLE_COMMENT Size of the statement digest. Use 0 to disable, -1 for automated sizing.
VARIABLE_COMMENT Size of the statement digest. Use 0 to disable, -1 for automated sizing
NUMERIC_MIN_VALUE -1
NUMERIC_MAX_VALUE 1048576
@@ -2844,7 +2844,7 @@
@@ -831,7 +831,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT
+VARIABLE_TYPE INT
VARIABLE_COMMENT Number of rows in EVENTS_STAGES_HISTORY_LONG. Use 0 to disable, -1 for automated sizing.
VARIABLE_COMMENT Number of rows in EVENTS_STAGES_HISTORY_LONG. Use 0 to disable, -1 for automated sizing
NUMERIC_MIN_VALUE -1
NUMERIC_MAX_VALUE 1048576
@@ -2854,7 +2854,7 @@
@@ -840,7 +840,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT
+VARIABLE_TYPE INT
VARIABLE_COMMENT Number of rows per thread in EVENTS_STAGES_HISTORY. Use 0 to disable, -1 for automated sizing.
VARIABLE_COMMENT Number of rows per thread in EVENTS_STAGES_HISTORY. Use 0 to disable, -1 for automated sizing
NUMERIC_MIN_VALUE -1
NUMERIC_MAX_VALUE 1024
@@ -2864,7 +2864,7 @@
@@ -849,7 +849,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT
+VARIABLE_TYPE INT
VARIABLE_COMMENT Number of rows in EVENTS_STATEMENTS_HISTORY_LONG. Use 0 to disable, -1 for automated sizing.
VARIABLE_COMMENT Number of rows in EVENTS_STATEMENTS_HISTORY_LONG. Use 0 to disable, -1 for automated sizing
NUMERIC_MIN_VALUE -1
NUMERIC_MAX_VALUE 1048576
@@ -2874,7 +2874,7 @@
@@ -858,7 +858,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT
+VARIABLE_TYPE INT
VARIABLE_COMMENT Number of rows per thread in EVENTS_STATEMENTS_HISTORY. Use 0 to disable, -1 for automated sizing.
VARIABLE_COMMENT Number of rows per thread in EVENTS_STATEMENTS_HISTORY. Use 0 to disable, -1 for automated sizing
NUMERIC_MIN_VALUE -1
NUMERIC_MAX_VALUE 1024
@@ -2884,7 +2884,7 @@
@@ -867,7 +867,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT
+VARIABLE_TYPE INT
VARIABLE_COMMENT Number of rows in EVENTS_TRANSACTIONS_HISTORY_LONG. Use 0 to disable, -1 for automated sizing.
VARIABLE_COMMENT Number of rows in EVENTS_TRANSACTIONS_HISTORY_LONG. Use 0 to disable, -1 for automated sizing
NUMERIC_MIN_VALUE -1
NUMERIC_MAX_VALUE 1048576
@@ -2894,7 +2894,7 @@
@@ -876,7 +876,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT
+VARIABLE_TYPE INT
VARIABLE_COMMENT Number of rows per thread in EVENTS_TRANSACTIONS_HISTORY. Use 0 to disable, -1 for automated sizing.
VARIABLE_COMMENT Number of rows per thread in EVENTS_TRANSACTIONS_HISTORY. Use 0 to disable, -1 for automated sizing
NUMERIC_MIN_VALUE -1
NUMERIC_MAX_VALUE 1024
@@ -2904,7 +2904,7 @@
@@ -885,7 +885,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT
+VARIABLE_TYPE INT
VARIABLE_COMMENT Number of rows in EVENTS_WAITS_HISTORY_LONG. Use 0 to disable, -1 for automated sizing.
VARIABLE_COMMENT Number of rows in EVENTS_WAITS_HISTORY_LONG. Use 0 to disable, -1 for automated sizing
NUMERIC_MIN_VALUE -1
NUMERIC_MAX_VALUE 1048576
@@ -2914,7 +2914,7 @@
@@ -894,7 +894,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT
+VARIABLE_TYPE INT
VARIABLE_COMMENT Number of rows per thread in EVENTS_WAITS_HISTORY. Use 0 to disable, -1 for automated sizing.
VARIABLE_COMMENT Number of rows per thread in EVENTS_WAITS_HISTORY. Use 0 to disable, -1 for automated sizing
NUMERIC_MIN_VALUE -1
NUMERIC_MAX_VALUE 1024
@@ -2924,7 +2924,7 @@
@@ -903,7 +903,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT
+VARIABLE_TYPE INT
VARIABLE_COMMENT Maximum number of instrumented hosts. Use 0 to disable, -1 for automated sizing.
VARIABLE_COMMENT Maximum number of instrumented hosts. Use 0 to disable, -1 for automated sizing
NUMERIC_MIN_VALUE -1
NUMERIC_MAX_VALUE 1048576
@@ -2934,7 +2934,7 @@
@@ -912,7 +912,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT UNSIGNED
+VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT Maximum number of condition instruments.
VARIABLE_COMMENT Maximum number of condition instruments
NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 256
@@ -2944,7 +2944,7 @@
@@ -921,7 +921,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT
+VARIABLE_TYPE INT
VARIABLE_COMMENT Maximum number of instrumented condition objects. Use 0 to disable, -1 for automated sizing.
VARIABLE_COMMENT Maximum number of instrumented condition objects. Use 0 to disable, -1 for automated sizing
NUMERIC_MIN_VALUE -1
NUMERIC_MAX_VALUE 1048576
@@ -2954,7 +2954,7 @@
@@ -930,7 +930,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT
+VARIABLE_TYPE INT
VARIABLE_COMMENT Maximum length considered for digest text, when stored in performance_schema tables.
VARIABLE_COMMENT Maximum length considered for digest text, when stored in performance_schema tables
NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 1048576
@@ -2964,7 +2964,7 @@
@@ -939,7 +939,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT UNSIGNED
+VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT Maximum number of file instruments.
VARIABLE_COMMENT Maximum number of file instruments
NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 256
@@ -2974,7 +2974,7 @@
@@ -948,7 +948,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT UNSIGNED
+VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT Maximum number of opened instrumented files.
VARIABLE_COMMENT Maximum number of opened instrumented files
NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 1048576
@@ -2984,7 +2984,7 @@
@@ -957,7 +957,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT
+VARIABLE_TYPE INT
VARIABLE_COMMENT Maximum number of instrumented files. Use 0 to disable, -1 for automated sizing.
VARIABLE_COMMENT Maximum number of instrumented files. Use 0 to disable, -1 for automated sizing
NUMERIC_MIN_VALUE -1
NUMERIC_MAX_VALUE 1048576
@@ -2994,7 +2994,7 @@
@@ -966,7 +966,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT
+VARIABLE_TYPE INT
VARIABLE_COMMENT Maximum number of index statistics for instrumented tables. Use 0 to disable, -1 for automated scaling.
VARIABLE_COMMENT Maximum number of index statistics for instrumented tables. Use 0 to disable, -1 for automated scaling
NUMERIC_MIN_VALUE -1
NUMERIC_MAX_VALUE 1048576
@@ -3004,7 +3004,7 @@
@@ -975,7 +975,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT UNSIGNED
+VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT Maximum number of memory pool instruments.
VARIABLE_COMMENT Maximum number of memory pool instruments
NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 1024
@@ -3014,7 +3014,7 @@
@@ -984,7 +984,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT
+VARIABLE_TYPE INT
VARIABLE_COMMENT Maximum number of metadata locks. Use 0 to disable, -1 for automated scaling.
VARIABLE_COMMENT Maximum number of metadata locks. Use 0 to disable, -1 for automated scaling
NUMERIC_MIN_VALUE -1
NUMERIC_MAX_VALUE 104857600
@@ -3024,7 +3024,7 @@
@@ -993,7 +993,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT UNSIGNED
+VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT Maximum number of mutex instruments.
VARIABLE_COMMENT Maximum number of mutex instruments
NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 256
@@ -3034,7 +3034,7 @@
@@ -1002,7 +1002,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT
+VARIABLE_TYPE INT
VARIABLE_COMMENT Maximum number of instrumented MUTEX objects. Use 0 to disable, -1 for automated sizing.
VARIABLE_COMMENT Maximum number of instrumented MUTEX objects. Use 0 to disable, -1 for automated sizing
NUMERIC_MIN_VALUE -1
NUMERIC_MAX_VALUE 104857600
@@ -3044,7 +3044,7 @@
@@ -1011,7 +1011,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT
+VARIABLE_TYPE INT
VARIABLE_COMMENT Maximum number of instrumented prepared statements. Use 0 to disable, -1 for automated scaling.
VARIABLE_COMMENT Maximum number of instrumented prepared statements. Use 0 to disable, -1 for automated scaling
NUMERIC_MIN_VALUE -1
NUMERIC_MAX_VALUE 1048576
@@ -3054,7 +3054,7 @@
@@ -1020,7 +1020,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT
+VARIABLE_TYPE INT
VARIABLE_COMMENT Maximum number of instrumented programs. Use 0 to disable, -1 for automated scaling.
VARIABLE_COMMENT Maximum number of instrumented programs. Use 0 to disable, -1 for automated scaling
NUMERIC_MIN_VALUE -1
NUMERIC_MAX_VALUE 1048576
@@ -3064,7 +3064,7 @@
@@ -1029,7 +1029,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT UNSIGNED
+VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT Maximum number of rwlock instruments.
VARIABLE_COMMENT Maximum number of rwlock instruments
NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 256
@@ -3074,7 +3074,7 @@
@@ -1038,7 +1038,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT
+VARIABLE_TYPE INT
VARIABLE_COMMENT Maximum number of instrumented RWLOCK objects. Use 0 to disable, -1 for automated sizing.
VARIABLE_COMMENT Maximum number of instrumented RWLOCK objects. Use 0 to disable, -1 for automated sizing
NUMERIC_MIN_VALUE -1
NUMERIC_MAX_VALUE 104857600
@@ -3084,7 +3084,7 @@
@@ -1047,7 +1047,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT UNSIGNED
+VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT Maximum number of socket instruments.
VARIABLE_COMMENT Maximum number of socket instruments
NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 256
@@ -3094,7 +3094,7 @@
@@ -1056,7 +1056,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT
+VARIABLE_TYPE INT
VARIABLE_COMMENT Maximum number of opened instrumented sockets. Use 0 to disable, -1 for automated sizing.
VARIABLE_COMMENT Maximum number of opened instrumented sockets. Use 0 to disable, -1 for automated sizing
NUMERIC_MIN_VALUE -1
NUMERIC_MAX_VALUE 1048576
@@ -3104,7 +3104,7 @@
@@ -1065,7 +1065,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT
+VARIABLE_TYPE INT
VARIABLE_COMMENT Maximum length of displayed sql text.
VARIABLE_COMMENT Maximum length of displayed sql text
NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 1048576
@@ -3114,7 +3114,7 @@
@@ -1074,7 +1074,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT UNSIGNED
+VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT Maximum number of stage instruments.
VARIABLE_COMMENT Maximum number of stage instruments
NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 256
@@ -3124,7 +3124,7 @@
@@ -1083,7 +1083,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT UNSIGNED
+VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT Maximum number of statement instruments.
VARIABLE_COMMENT Maximum number of statement instruments
NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 256
@@ -3134,7 +3134,7 @@
@@ -1092,7 +1092,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT UNSIGNED
+VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT Number of rows per thread in EVENTS_STATEMENTS_CURRENT.
VARIABLE_COMMENT Number of rows per thread in EVENTS_STATEMENTS_CURRENT
NUMERIC_MIN_VALUE 1
NUMERIC_MAX_VALUE 256
@@ -3144,7 +3144,7 @@
@@ -1101,7 +1101,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT
+VARIABLE_TYPE INT
VARIABLE_COMMENT Maximum number of opened instrumented tables. Use 0 to disable, -1 for automated sizing.
VARIABLE_COMMENT Maximum number of opened instrumented tables. Use 0 to disable, -1 for automated sizing
NUMERIC_MIN_VALUE -1
NUMERIC_MAX_VALUE 1048576
@@ -3154,7 +3154,7 @@
@@ -1110,7 +1110,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT
+VARIABLE_TYPE INT
VARIABLE_COMMENT Maximum number of instrumented tables. Use 0 to disable, -1 for automated sizing.
VARIABLE_COMMENT Maximum number of instrumented tables. Use 0 to disable, -1 for automated sizing
NUMERIC_MIN_VALUE -1
NUMERIC_MAX_VALUE 1048576
@@ -3164,7 +3164,7 @@
@@ -1119,7 +1119,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT
+VARIABLE_TYPE INT
VARIABLE_COMMENT Maximum number of lock statistics for instrumented tables. Use 0 to disable, -1 for automated scaling.
VARIABLE_COMMENT Maximum number of lock statistics for instrumented tables. Use 0 to disable, -1 for automated scaling
NUMERIC_MIN_VALUE -1
NUMERIC_MAX_VALUE 1048576
@@ -3174,7 +3174,7 @@
@@ -1128,7 +1128,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT UNSIGNED
+VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT Maximum number of thread instruments.
VARIABLE_COMMENT Maximum number of thread instruments
NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 256
@@ -3184,7 +3184,7 @@
@@ -1137,7 +1137,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT
+VARIABLE_TYPE INT
VARIABLE_COMMENT Maximum number of instrumented threads. Use 0 to disable, -1 for automated sizing.
VARIABLE_COMMENT Maximum number of instrumented threads. Use 0 to disable, -1 for automated sizing
NUMERIC_MIN_VALUE -1
NUMERIC_MAX_VALUE 1048576
@@ -3194,7 +3194,7 @@
@@ -1146,7 +1146,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT
+VARIABLE_TYPE INT
VARIABLE_COMMENT Size of session attribute string buffer per thread. Use 0 to disable, -1 for automated sizing.
VARIABLE_COMMENT Size of session attribute string buffer per thread. Use 0 to disable, -1 for automated sizing
NUMERIC_MIN_VALUE -1
NUMERIC_MAX_VALUE 1048576
@@ -3204,7 +3204,7 @@
@@ -1155,7 +1155,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT
+VARIABLE_TYPE INT
VARIABLE_COMMENT Maximum number of rows in SETUP_ACTORS.
VARIABLE_COMMENT Maximum number of rows in SETUP_ACTORS
NUMERIC_MIN_VALUE -1
NUMERIC_MAX_VALUE 1024
@@ -3214,7 +3214,7 @@
@@ -1164,7 +1164,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT
+VARIABLE_TYPE INT
VARIABLE_COMMENT Maximum number of rows in SETUP_OBJECTS.
VARIABLE_COMMENT Maximum number of rows in SETUP_OBJECTS
NUMERIC_MIN_VALUE -1
NUMERIC_MAX_VALUE 1048576
@@ -3224,7 +3224,7 @@
@@ -1173,7 +1173,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT
+VARIABLE_TYPE INT
VARIABLE_COMMENT Maximum number of instrumented users. Use 0 to disable, -1 for automated sizing.
VARIABLE_COMMENT Maximum number of instrumented users. Use 0 to disable, -1 for automated sizing
NUMERIC_MIN_VALUE -1
NUMERIC_MAX_VALUE 1048576
@@ -3274,7 +3274,7 @@
@@ -1191,7 +1191,7 @@
VARIABLE_SCOPE SESSION
-VARIABLE_TYPE BIGINT UNSIGNED
+VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT Number of statements about which profiling information is maintained. If set to 0, no profiles are stored. See SHOW PROFILES.
VARIABLE_COMMENT Number of statements about which profiling information is maintained. If set to 0, no profiles are stored. See SHOW PROFILES
NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 100
@@ -3304,7 +3304,7 @@
@@ -1200,7 +1200,7 @@
VARIABLE_SCOPE SESSION
-VARIABLE_TYPE BIGINT UNSIGNED
+VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT Seconds between sending progress reports to the client for time-consuming statements. Set to 0 to disable progress reporting.
VARIABLE_COMMENT Seconds between sending progress reports to the client for time-consuming statements. Set to 0 to disable progress reporting
NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 4294967295
@@ -3364,7 +3364,7 @@
@@ -1331,7 +1331,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT UNSIGNED
+VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT The tracing level for semi-sync replication.
VARIABLE_COMMENT The tracing level for semi-sync replication
NUMERIC_MIN_VALUE 0
-NUMERIC_MAX_VALUE 18446744073709551615
+NUMERIC_MAX_VALUE 4294967295
@@ -1344,7 +1344,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT UNSIGNED
+VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT The tracing level for semi-sync replication.
VARIABLE_COMMENT The tracing level for semi-sync replication
NUMERIC_MIN_VALUE 0
-NUMERIC_MAX_VALUE 18446744073709551615
+NUMERIC_MAX_VALUE 4294967295
@@ -1366,7 +1366,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT UNSIGNED
+VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT Maximum number of parallel threads to use on slave for events in a single replication domain. When using multiple domains, this can be used to limit a single domain from grabbing all threads and thus stalling other domains. The default of 0 means to allow a domain to grab as many threads as it wants, up to the value of slave_parallel_threads.
VARIABLE_COMMENT Maximum number of parallel threads to use on slave for events in a single replication domain. When using multiple domains, this can be used to limit a single domain from grabbing all threads and thus stalling other domains. The default of 0 means to allow a domain to grab as many threads as it wants, up to the value of slave_parallel_threads
NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 16383
@@ -4044,7 +4044,7 @@
@@ -1375,7 +1375,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT UNSIGNED
+VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT The maximum packet length to sent successfully from the master to slave.
VARIABLE_COMMENT The maximum packet length to sent successfully from the master to slave
NUMERIC_MIN_VALUE 1024
NUMERIC_MAX_VALUE 1073741824
@@ -4074,7 +4074,7 @@
@@ -1384,7 +1384,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT UNSIGNED
+VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT Limit on how much memory SQL threads should use per parallel replication thread when reading ahead in the relay log looking for opportunities for parallel replication. Only used when --slave-parallel-threads > 0.
VARIABLE_COMMENT Limit on how much memory SQL threads should use per parallel replication thread when reading ahead in the relay log looking for opportunities for parallel replication. Only used when --slave-parallel-threads > 0
NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 2147483647
@@ -4094,7 +4094,7 @@
@@ -1447,7 +1447,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT UNSIGNED
+VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT The soft upper limit for number of cached stored routines for one connection.
VARIABLE_COMMENT The soft upper limit for number of cached stored routines for one connection
NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 524288
@@ -4564,7 +4564,7 @@
@@ -1479,7 +1479,7 @@
NUMERIC_MAX_VALUE 16384
@@ -4797,7 +4797,7 @@
VARIABLE_TYPE BIGINT UNSIGNED
VARIABLE_COMMENT Max size for data for an internal temporary on-disk MyISAM or Aria table.
VARIABLE_COMMENT Max size for data for an internal temporary on-disk MyISAM or Aria table
NUMERIC_MIN_VALUE 1024
-NUMERIC_MAX_VALUE 18446744073709551615
+NUMERIC_MAX_VALUE 4294967295
@@ -1488,7 +1488,7 @@
READ_ONLY NO
@@ -4807,7 +4807,7 @@
VARIABLE_TYPE BIGINT UNSIGNED
VARIABLE_COMMENT If an internal in-memory temporary table exceeds this size, MariaDB will automatically convert it to an on-disk MyISAM or Aria table. Same as tmp_table_size.
VARIABLE_COMMENT If an internal in-memory temporary table exceeds this size, MariaDB will automatically convert it to an on-disk MyISAM or Aria table. Same as tmp_table_size
NUMERIC_MIN_VALUE 0
-NUMERIC_MAX_VALUE 18446744073709551615
+NUMERIC_MAX_VALUE 4294967295
@@ -1497,7 +1497,7 @@
READ_ONLY NO
@@ -4817,14 +4817,14 @@
VARIABLE_TYPE BIGINT UNSIGNED
VARIABLE_COMMENT Alias for tmp_memory_table_size. If an internal in-memory temporary table exceeds this size, MariaDB will automatically convert it to an on-disk MyISAM or Aria table.
VARIABLE_COMMENT Alias for tmp_memory_table_size. If an internal in-memory temporary table exceeds this size, MariaDB will automatically convert it to an on-disk MyISAM or Aria table
NUMERIC_MIN_VALUE 0
-NUMERIC_MAX_VALUE 18446744073709551615
+NUMERIC_MAX_VALUE 4294967295
@@ -1536,6 +1536,6 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT UNSIGNED
+VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT Size of transaction coordinator log.
VARIABLE_COMMENT Size of transaction coordinator log
ENUM_VALUE_LIST NULL
READ_ONLY YES

10
mysql-test/suite/sys_vars/r/sysvars_server_notembedded,aix.rdiff
View File

@@ -1,6 +1,6 @@
--- a/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result
+++ b/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result
@@ -4639,99 +4639,9 @@
@@ -4649,99 +4649,9 @@
NUMERIC_MIN_VALUE NULL
NUMERIC_MAX_VALUE NULL
NUMERIC_BLOCK_SIZE NULL
@@ -51,7 +51,7 @@
-VARIABLE_NAME THREAD_POOL_OVERSUBSCRIBE
-VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE INT UNSIGNED
-VARIABLE_COMMENT How many additional active worker threads in a group are allowed.
-VARIABLE_COMMENT How many additional active worker threads in a group are allowed
-NUMERIC_MIN_VALUE 1
-NUMERIC_MAX_VALUE 1000
-NUMERIC_BLOCK_SIZE 1
@@ -61,7 +61,7 @@
-VARIABLE_NAME THREAD_POOL_PRIORITY
-VARIABLE_SCOPE SESSION
-VARIABLE_TYPE ENUM
-VARIABLE_COMMENT Threadpool priority. High priority connections usually start executing earlier than low priority.If priority set to 'auto', the the actual priority(low or high) is determined based on whether or not connection is inside transaction.
-VARIABLE_COMMENT Threadpool priority. High priority connections usually start executing earlier than low priority.If priority set to 'auto', the the actual priority(low or high) is determined based on whether or not connection is inside transaction
-NUMERIC_MIN_VALUE NULL
-NUMERIC_MAX_VALUE NULL
-NUMERIC_BLOCK_SIZE NULL
@@ -81,7 +81,7 @@
-VARIABLE_NAME THREAD_POOL_SIZE
-VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE INT UNSIGNED
-VARIABLE_COMMENT Number of thread groups in the pool. This parameter is roughly equivalent to maximum number of concurrently executing threads (threads in a waiting state do not count as executing).
-VARIABLE_COMMENT Number of thread groups in the pool. This parameter is roughly equivalent to maximum number of concurrently executing threads (threads in a waiting state do not count as executing)
-NUMERIC_MIN_VALUE 1
-NUMERIC_MAX_VALUE 100000
-NUMERIC_BLOCK_SIZE 1
@@ -91,7 +91,7 @@
-VARIABLE_NAME THREAD_POOL_STALL_LIMIT
-VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE INT UNSIGNED
-VARIABLE_COMMENT Maximum query execution time in milliseconds,before an executing non-yielding thread is considered stalled.If a worker thread is stalled, additional worker thread may be created to handle remaining clients.
-VARIABLE_COMMENT Maximum query execution time in milliseconds,before an executing non-yielding thread is considered stalled.If a worker thread is stalled, additional worker thread may be created to handle remaining clients
-NUMERIC_MIN_VALUE 1
-NUMERIC_MAX_VALUE 4294967295
-NUMERIC_BLOCK_SIZE 1

457
mysql-test/suite/sys_vars/r/sysvars_server_notembedded,win.rdiff
View File

File diff suppressed because it is too large Load Diff

424
mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result
View File

File diff suppressed because it is too large Load Diff

4
mysql-test/suite/sys_vars/r/sysvars_star.result
View File

@@ -78,7 +78,7 @@ GLOBAL_VALUE_ORIGIN COMMAND-LINE
DEFAULT_VALUE 1
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT Sampling rate. If set to 0(zero), the logging is disabled.
VARIABLE_COMMENT Sampling rate. If set to 0(zero), the logging is disabled
NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 1000000
NUMERIC_BLOCK_SIZE 1
@@ -93,7 +93,7 @@ GLOBAL_VALUE_ORIGIN CONFIG
DEFAULT_VALUE 9
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT Number of rotations before log is removed.
VARIABLE_COMMENT Number of rotations before log is removed
NUMERIC_MIN_VALUE 1
NUMERIC_MAX_VALUE 999
NUMERIC_BLOCK_SIZE 1

12
mysql-test/suite/sys_vars/r/sysvars_wsrep,32bit.rdiff
View File

@@ -1,6 +1,6 @@
--- a/mysql-test/suite/sys_vars/r/sysvars_wsrep.result
+++ b/mysql-test/suite/sys_vars/r/sysvars_wsrep.result
@@ -307,7 +307,7 @@
@@ -292,7 +292,7 @@
GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE 0
VARIABLE_SCOPE GLOBAL
@@ -9,7 +9,7 @@
VARIABLE_COMMENT Max number of rows in write set
NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 1048576
@@ -322,7 +322,7 @@
@@ -307,7 +307,7 @@
GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE 2147483647
VARIABLE_SCOPE GLOBAL
@@ -18,16 +18,16 @@
VARIABLE_COMMENT Max write set size (bytes)
NUMERIC_MIN_VALUE 1024
NUMERIC_MAX_VALUE 2147483647
@@ -352,7 +352,7 @@
@@ -337,7 +337,7 @@
GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE 0
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT UNSIGNED
+VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT mysql replication group commit
VARIABLE_COMMENT mysql replication group commit
NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 1000
@@ -547,7 +547,7 @@
@@ -532,7 +532,7 @@
GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE 1
VARIABLE_SCOPE SESSION
@@ -36,7 +36,7 @@
VARIABLE_COMMENT Max number of times to retry a failed autocommit statement
NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 10000
@@ -577,7 +577,7 @@
@@ -562,7 +562,7 @@
GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE 1
VARIABLE_SCOPE GLOBAL

26
mysql-test/suite/sys_vars/r/sysvars_wsrep.result
View File

@@ -38,7 +38,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE strict
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE ENUM
VARIABLE_COMMENT Certification rules to use in the cluster. Possible values are: "strict": stricter rules that could result in more certification failures. "optimized": relaxed rules that allow more concurrency and cause less certification failures.
VARIABLE_COMMENT Certification rules to use in the cluster. Possible values are: "strict": stricter rules that could result in more certification failures. "optimized": relaxed rules that allow more concurrency and cause less certification failures
NUMERIC_MIN_VALUE NULL
NUMERIC_MAX_VALUE NULL
NUMERIC_BLOCK_SIZE NULL
@@ -173,7 +173,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE OFF
VARIABLE_SCOPE SESSION
VARIABLE_TYPE BOOLEAN
VARIABLE_COMMENT Allow reads even when the node is not in the primary component.
VARIABLE_COMMENT Allow reads even when the node is not in the primary component
NUMERIC_MIN_VALUE NULL
NUMERIC_MAX_VALUE NULL
NUMERIC_BLOCK_SIZE NULL
@@ -218,7 +218,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE 0
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT When wsrep_gtid_mode is set, this value is used as gtid_domain_id for galera transactions and also copied to the joiner nodes during state transfer. It is ignored, otherwise.
VARIABLE_COMMENT When wsrep_gtid_mode is set, this value is used as gtid_domain_id for galera transactions and also copied to the joiner nodes during state transfer. It is ignored, otherwise
NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 4294967295
NUMERIC_BLOCK_SIZE 1
@@ -233,7 +233,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE OFF
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE BOOLEAN
VARIABLE_COMMENT Automatically update the (joiner) node's wsrep_gtid_domain_id value with that of donor's (received during state transfer) and use it in place of gtid_domain_id for all galera transactions. When OFF (default), wsrep_gtid_domain_id is simply ignored (backward compatibility).
VARIABLE_COMMENT Automatically update the (joiner) node's wsrep_gtid_domain_id value with that of donor's (received during state transfer) and use it in place of gtid_domain_id for all galera transactions. When OFF (default), wsrep_gtid_domain_id is simply ignored (backward compatibility)
NUMERIC_MIN_VALUE NULL
NUMERIC_MAX_VALUE NULL
NUMERIC_BLOCK_SIZE NULL
@@ -248,7 +248,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE 0
VARIABLE_SCOPE SESSION ONLY
VARIABLE_TYPE BIGINT UNSIGNED
VARIABLE_COMMENT Internal server usage, manually set WSREP GTID seqno.
VARIABLE_COMMENT Internal server usage, manually set WSREP GTID seqno
NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 18446744073709551615
NUMERIC_BLOCK_SIZE 1
@@ -323,7 +323,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE SET
VARIABLE_COMMENT Set of WSREP features that are enabled.
VARIABLE_COMMENT Set of WSREP features that are enabled
NUMERIC_MIN_VALUE NULL
NUMERIC_MAX_VALUE NULL
NUMERIC_BLOCK_SIZE NULL
@@ -338,7 +338,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE 0
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE BIGINT UNSIGNED
VARIABLE_COMMENT mysql replication group commit
VARIABLE_COMMENT mysql replication group commit
NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 1000
NUMERIC_BLOCK_SIZE 1
@@ -353,7 +353,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE VARCHAR
VARIABLE_COMMENT Specifies the node's network address, in the format ip address[:port]. Used in situations where autoguessing is not reliable. As of MariaDB 10.1.8, supports IPv6.
VARIABLE_COMMENT Specifies the node's network address, in the format ip address[:port]. Used in situations where autoguessing is not reliable. As of MariaDB 10.1.8, supports IPv6
NUMERIC_MIN_VALUE NULL
NUMERIC_MAX_VALUE NULL
NUMERIC_BLOCK_SIZE NULL
@@ -383,7 +383,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE HOSTNAME
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE VARCHAR
VARIABLE_COMMENT Name of this node. This name can be used in wsrep_sst_donor as a preferred donor. Note that multiple nodes in a cluster can have the same name.
VARIABLE_COMMENT Name of this node. This name can be used in wsrep_sst_donor as a preferred donor. Note that multiple nodes in a cluster can have the same name
NUMERIC_MIN_VALUE NULL
NUMERIC_MAX_VALUE NULL
NUMERIC_BLOCK_SIZE NULL
@@ -413,7 +413,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE OFF
VARIABLE_SCOPE SESSION
VARIABLE_TYPE BOOLEAN
VARIABLE_COMMENT To enable wsrep replication
VARIABLE_COMMENT To enable wsrep replication
NUMERIC_MIN_VALUE NULL
NUMERIC_MAX_VALUE NULL
NUMERIC_BLOCK_SIZE NULL
@@ -443,7 +443,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE NULL
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE VARCHAR
VARIABLE_COMMENT Wsrep patch version, for example wsrep_MAJVER.MINVER.
VARIABLE_COMMENT Wsrep patch version, for example wsrep_MAJVER.MINVER
NUMERIC_MIN_VALUE NULL
NUMERIC_MAX_VALUE NULL
NUMERIC_BLOCK_SIZE NULL
@@ -473,7 +473,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE VARCHAR
VARIABLE_COMMENT Semicolon (;) separated list of wsrep options (see wsrep_provider_options documentation).
VARIABLE_COMMENT Semicolon (;) separated list of wsrep options (see wsrep_provider_options documentation)
NUMERIC_MIN_VALUE NULL
NUMERIC_MAX_VALUE NULL
NUMERIC_BLOCK_SIZE NULL
@@ -683,7 +683,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE 00000000-0000-0000-0000-000000000000:-1
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE VARCHAR
VARIABLE_COMMENT global transaction position to start from
VARIABLE_COMMENT global transaction position to start from
NUMERIC_MIN_VALUE NULL
NUMERIC_MAX_VALUE NULL
NUMERIC_BLOCK_SIZE NULL

2
mysql-test/suite/sys_vars/r/version.result
View File

@@ -10,7 +10,7 @@ GLOBAL_VALUE_ORIGIN COMMAND-LINE
DEFAULT_VALUE NULL
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE VARCHAR
VARIABLE_COMMENT Server version number. It may also include a suffix with configuration or build information. -debug indicates debugging support was enabled on the server, and -log indicates at least one of the binary log, general log or slow query log are enabled, for example 10.1.1-MariaDB-mariadb1precise-log.
VARIABLE_COMMENT Server version number. It may also include a suffix with configuration or build information. -debug indicates debugging support was enabled on the server, and -log indicates at least one of the binary log, general log or slow query log are enabled, for example 10.1.1-MariaDB-mariadb1precise-log
NUMERIC_MIN_VALUE NULL
NUMERIC_MAX_VALUE NULL
NUMERIC_BLOCK_SIZE NULL

67
mysys/my_getopt.c
View File

@@ -181,6 +181,24 @@ static void validate_value(const char *key, const char *value,
#define SET_HO_ERROR_AND_CONTINUE(e) { ho_error= (e); (*argc)--; continue; }
void warn_deprecated(const struct my_option *optp)
{
char buf1[NAME_CHAR_LEN + 3];
strxmov(buf1, "--", optp->name, NullS);
convert_underscore_to_dash(buf1, strlen(buf1));
if (IS_DEPRECATED_NO_REPLACEMENT(optp->deprecation_substitute))
my_getopt_error_reporter(WARNING_LEVEL, "%s is deprecated and will be "
"removed in a future release", buf1);
else
{
char buf2[NAME_CHAR_LEN + 3];
strxmov(buf2, "--", optp->deprecation_substitute, NullS);
convert_underscore_to_dash(buf2, strlen(buf2));
my_getopt_error_reporter(WARNING_LEVEL, "%s is deprecated and will be "
"removed in a future release. Please use %s instead.", buf1, buf2);
}
}
/**
Handle command line options.
Sort options.
@@ -500,6 +518,8 @@ int handle_options(int *argc, char ***argv, const struct my_option *longopts,
enabled_my_option : disabled_my_option,
filename))
SET_HO_ERROR_AND_CONTINUE(EXIT_ARGUMENT_INVALID)
if (optp->deprecation_substitute)
warn_deprecated(optp);
continue;
}
argument= optend;
@@ -575,6 +595,8 @@ int handle_options(int *argc, char ***argv, const struct my_option *longopts,
*((my_bool*) optp->value)= (my_bool) 1;
if (get_one_option(optp, argument, filename))
SET_HO_ERROR_AND_CONTINUE(EXIT_UNSPECIFIED_ERROR)
if (optp->deprecation_substitute)
warn_deprecated(optp);
continue;
}
else if (optp->arg_type == REQUIRED_ARG ||
@@ -595,6 +617,8 @@ int handle_options(int *argc, char ***argv, const struct my_option *longopts,
*((my_bool*) optp->value)= (my_bool) 1;
if (get_one_option(optp, argument, filename))
SET_HO_ERROR_AND_CONTINUE(EXIT_UNSPECIFIED_ERROR)
if (optp->deprecation_substitute)
warn_deprecated(optp);
continue;
}
/* Check if there are more arguments after this one */
@@ -616,6 +640,8 @@ int handle_options(int *argc, char ***argv, const struct my_option *longopts,
SET_HO_ERROR_AND_CONTINUE(error)
if (get_one_option(optp, argument, filename))
SET_HO_ERROR_AND_CONTINUE(EXIT_UNSPECIFIED_ERROR)
if (optp->deprecation_substitute)
warn_deprecated(optp);
break;
}
}
@@ -663,6 +689,8 @@ int handle_options(int *argc, char ***argv, const struct my_option *longopts,
SET_HO_ERROR_AND_CONTINUE(error)
if (get_one_option(optp, argument, filename))
SET_HO_ERROR_AND_CONTINUE(EXIT_UNSPECIFIED_ERROR)
if (optp->deprecation_substitute)
warn_deprecated(optp);
(*argc)--; /* option handled (long), decrease argument count */
}
@@ -1615,26 +1643,6 @@ void my_print_help(const struct my_option *options)
col+= (optp->arg_type == OPT_ARG) ? 5 : 3;
}
}
if (optp->deprecation_substitute != NULL)
{
if (IS_DEPRECATED_NO_REPLACEMENT(optp->deprecation_substitute))
col= print_comment("(it's deprecated and will be removed in a future release)",
col, name_space, comment_space);
else
{
char buf1[NAME_CHAR_LEN + 3];
strxmov(buf1, "--", optp->deprecation_substitute, NullS);
convert_underscore_to_dash(buf1, strlen(optp->deprecation_substitute) + 2);
col= print_comment("(it's deprecated and will be removed in a future release. Please use '",
col, name_space, comment_space);
col= print_comment(buf1,
col, name_space, comment_space);
col= print_comment("' instead)",
col, name_space, comment_space);
}
}
if (optp->comment && *optp->comment)
{
uint count;
@@ -1679,6 +1687,23 @@ void my_print_help(const struct my_option *options)
col= print_comment(optp->typelib->type_names[i], col, name_space, comment_space);
}
}
if ((optp->var_type & GET_TYPE_MASK) == GET_SET)
col= print_comment(", or ALL to set all combinations", col, name_space, comment_space);
if (optp->deprecation_substitute != NULL)
{
col= print_comment(". Deprecated, will be removed in a future release.",
col, name_space, comment_space);
if (!IS_DEPRECATED_NO_REPLACEMENT(optp->deprecation_substitute))
{
char buf1[NAME_CHAR_LEN + 3];
DBUG_ASSERT(strlen(optp->deprecation_substitute) < NAME_CHAR_LEN);
strxmov(buf1, "--", optp->deprecation_substitute, NullS);
convert_underscore_to_dash(buf1, strlen(buf1));
col= print_comment(" Please use ", col, name_space, comment_space);
col= print_comment(buf1, col, name_space, comment_space);
col= print_comment(" instead.", col, name_space, comment_space);
}
}
}
putchar('\n');
if ((optp->var_type & GET_TYPE_MASK) == GET_BOOL ||
@@ -1691,8 +1716,6 @@ void my_print_help(const struct my_option *options)
printf(" to disable.)\n");
}
}
else if ((optp->var_type & GET_TYPE_MASK) == GET_SET)
printf(" Use 'ALL' to set all combinations.\n");
}
DBUG_VOID_RETURN;
}

2
plugin/auth_gssapi/server_plugin.cc
View File

@@ -98,7 +98,7 @@ static MYSQL_SYSVAR_STR(keytab_path, srv_keytab_path,
static MYSQL_SYSVAR_STR(principal_name, srv_principal_name,
PLUGIN_VAR_RQCMDARG|PLUGIN_VAR_READONLY,
"GSSAPI target name - service principal name for Kerberos authentication.",
"GSSAPI target name - service principal name for Kerberos authentication",
NULL,
NULL,
"");

8
plugin/aws_key_management/aws_key_management_plugin.cc
View File

@@ -704,7 +704,7 @@ static MYSQL_SYSVAR_STR(master_key_id, master_key_id,
static MYSQL_SYSVAR_ENUM(key_spec, key_spec,
PLUGIN_VAR_RQCMDARG,
"Encryption algorithm used to create new keys.",
"Encryption algorithm used to create new keys",
NULL, NULL, 0, &key_spec_typelib);
@@ -722,12 +722,12 @@ static MYSQL_SYSVAR_INT(rotate_key, rotate_key,
static MYSQL_SYSVAR_INT(request_timeout, request_timeout,
PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
"Timeout in milliseconds for create HTTPS connection or execute AWS request. Specify 0 to use SDK default.",
"Timeout in milliseconds for create HTTPS connection or execute AWS request. Specify 0 to use SDK default",
NULL, NULL, 0, 0, INT_MAX, 1);
static MYSQL_SYSVAR_STR(region, region,
PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
"AWS region. For example us-east-1, or eu-central-1. If no value provided, SDK default is used.",
"AWS region. For example us-east-1, or eu-central-1. If no value provided, SDK default is used",
NULL, NULL, "");
static MYSQL_SYSVAR_STR(endpoint_url, endpoint_url,
@@ -744,7 +744,7 @@ static MYSQL_SYSVAR_STR(keyfile_dir, keyfile_dir,
#if WITH_AWS_MOCK
static MYSQL_SYSVAR_BOOL(mock, mock,
PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
"Mock AWS KMS calls (for testing).",
"Mock AWS KMS calls (for testing)",
NULL, NULL, 0);
#endif

12
plugin/feedback/feedback.cc
View File

@@ -363,23 +363,23 @@ static int free(void *p)
static MYSQL_SYSVAR_STR(server_uid, server_uid,
PLUGIN_VAR_READONLY | PLUGIN_VAR_NOCMDOPT,
"Automatically calculated server unique id hash.", NULL, NULL, 0);
"Automatically calculated server unique id hash", NULL, NULL, 0);
static MYSQL_SYSVAR_STR(user_info, user_info,
PLUGIN_VAR_READONLY | PLUGIN_VAR_RQCMDARG,
"User specified string that will be included in the feedback report.",
"User specified string that will be included in the feedback report",
NULL, NULL, "");
static MYSQL_SYSVAR_STR(url, url, PLUGIN_VAR_READONLY | PLUGIN_VAR_RQCMDARG,
"Space separated URLs to send the feedback report to.", NULL, NULL,
"Space separated URLs to send the feedback report to", NULL, NULL,
DEFAULT_PROTO "feedback.mariadb.org/rest/v1/post");
static MYSQL_SYSVAR_ULONG(send_timeout, send_timeout, PLUGIN_VAR_RQCMDARG,
"Timeout (in seconds) for the sending the report.",
"Timeout (in seconds) for the sending the report",
NULL, NULL, 60, 1, 60*60*24, 1);
static MYSQL_SYSVAR_ULONG(send_retry_wait, send_retry_wait, PLUGIN_VAR_RQCMDARG,
"Wait this many seconds before retrying a failed send.",
"Wait this many seconds before retrying a failed send",
NULL, NULL, 60, 1, 60*60*24, 1);
static MYSQL_SYSVAR_STR(http_proxy, http_proxy,
PLUGIN_VAR_READONLY | PLUGIN_VAR_RQCMDARG,
"Proxy server host:port.", NULL, NULL,0);
"Proxy server host:port", NULL, NULL,0);
#ifndef DBUG_OFF
static MYSQL_SYSVAR_ULONG(debug_startup_interval, debug_startup_interval,

6
plugin/file_key_management/file_key_management_plugin.cc
View File

@@ -41,12 +41,12 @@ static TYPELIB encryption_algorithm_typelib=
static MYSQL_SYSVAR_STR(filename, filename,
PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
"Path and name of the key file.",
"Path and name of the key file",
NULL, NULL, "");
static MYSQL_SYSVAR_STR(filekey, filekey,
PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
"Key to encrypt / decrypt the keyfile.",
"Key to encrypt / decrypt the keyfile",
NULL, NULL, "");
#ifdef HAVE_EncryptAes128Ctr
@@ -56,7 +56,7 @@ static MYSQL_SYSVAR_STR(filekey, filekey,
#endif
static MYSQL_SYSVAR_ENUM(encryption_algorithm, encryption_algorithm,
PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
"Encryption algorithm to use" recommendation ".",
"Encryption algorithm to use" recommendation,
NULL, NULL, 0, &encryption_algorithm_typelib);
static struct st_mysql_sys_var* settings[] = {

8
plugin/fulltext/plugin_example.c
View File

@@ -224,22 +224,22 @@ static char *sysvar_two_value;
static MYSQL_SYSVAR_LONG(simple_sysvar_one, sysvar_one_value,
PLUGIN_VAR_RQCMDARG,
"Simple fulltext parser example system variable number one. Give a number.",
"Simple fulltext parser example system variable number one. Give a number",
NULL, NULL, 77L, 7L, 777L, 0);
static MYSQL_SYSVAR_STR(simple_sysvar_two, sysvar_two_value,
PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_MEMALLOC,
"Simple fulltext parser example system variable number two. Give a string.",
"Simple fulltext parser example system variable number two. Give a string",
NULL, NULL, "simple sysvar two default");
static MYSQL_THDVAR_LONG(simple_thdvar_one,
PLUGIN_VAR_RQCMDARG,
"Simple fulltext parser example thread variable number one. Give a number.",
"Simple fulltext parser example thread variable number one. Give a number",
NULL, NULL, 88L, 8L, 888L, 0);
static MYSQL_THDVAR_STR(simple_thdvar_two,
PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_MEMALLOC,
"Simple fulltext parser example thread variable number two. Give a string.",
"Simple fulltext parser example thread variable number two. Give a string",
NULL, NULL, "simple thdvar two default");
static struct st_mysql_sys_var* simple_system_variables[]= {

2
plugin/query_response_time/plugin.cc
View File

@@ -54,7 +54,7 @@ static MYSQL_SYSVAR_BOOL(flush, opt_query_response_time_flush,
#ifndef DBUG_OFF
static MYSQL_THDVAR_ULONGLONG(exec_time_debug, PLUGIN_VAR_NOCMDOPT,
"Pretend queries take this many microseconds. When 0 (the default) use "
"the actual execution time. Used only for debugging.",
"the actual execution time. Used only for debugging",
NULL, NULL, 0, 0, LONG_TIMEOUT, 1);
#endif

32
plugin/server_audit/server_audit.c
View File

@@ -27,10 +27,10 @@
#define DO_SYSLOG
#include <syslog.h>
static const char out_type_desc[]= "Desired output type. Possible values - 'syslog', 'file'"
" or 'null' as no output.";
" or 'null' as no output";
#else
static const char out_type_desc[]= "Desired output type. Possible values - 'file'"
" or 'null' as no output.";
" or 'null' as no output";
#define syslog(PRIORITY, FORMAT, INFO, MESSAGE_LEN, MESSAGE) do {}while(0)
static void closelog() {}
#define openlog(IDENT, LOG_NOWAIT, LOG_USER) do {}while(0)
@@ -373,10 +373,10 @@ static void rotate_log(MYSQL_THD thd, struct st_mysql_sys_var *var,
void *var_ptr, const void *save);
static MYSQL_SYSVAR_STR(incl_users, incl_users, PLUGIN_VAR_RQCMDARG,
"Comma separated list of users to monitor.",
"Comma separated list of users to monitor",
check_incl_users, update_incl_users, NULL);
static MYSQL_SYSVAR_STR(excl_users, excl_users, PLUGIN_VAR_RQCMDARG,
"Comma separated list of users to exclude from auditing.",
"Comma separated list of users to exclude from auditing",
check_excl_users, update_excl_users, NULL);
/* bits in the event filter. */
#define EVENT_CONNECT 1
@@ -399,7 +399,7 @@ static TYPELIB events_typelib=
};
static MYSQL_SYSVAR_SET(events, events, PLUGIN_VAR_RQCMDARG,
"Specifies the set of events to monitor. Can be CONNECT, QUERY, TABLE,"
" QUERY_DDL, QUERY_DML, QUERY_DML_NO_SELECT, QUERY_DCL.",
" QUERY_DDL, QUERY_DML, QUERY_DML_NO_SELECT, QUERY_DCL",
NULL, NULL, 0, &events_typelib);
#ifdef DO_SYSLOG
#define OUTPUT_SYSLOG 0
@@ -425,29 +425,29 @@ static MYSQL_SYSVAR_ENUM(output_type, output_type, PLUGIN_VAR_RQCMDARG,
0, update_output_type, OUTPUT_FILE,
&output_typelib);
static MYSQL_SYSVAR_STR(file_path, file_path, PLUGIN_VAR_RQCMDARG,
"Path to the log file.", NULL, update_file_path, default_file_name);
"Path to the log file", NULL, update_file_path, default_file_name);
static MYSQL_SYSVAR_ULONGLONG(file_rotate_size, file_rotate_size,
PLUGIN_VAR_RQCMDARG, "Maximum size of the log to start the rotation.",
PLUGIN_VAR_RQCMDARG, "Maximum size of the log to start the rotation",
NULL, update_file_rotate_size,
1000000, 100, ((long long) 0x7FFFFFFFFFFFFFFFLL), 1);
static MYSQL_SYSVAR_UINT(file_rotations, rotations,
PLUGIN_VAR_RQCMDARG, "Number of rotations before log is removed.",
PLUGIN_VAR_RQCMDARG, "Number of rotations before log is removed",
NULL, update_file_rotations, 9, 0, 999, 1);
static MYSQL_SYSVAR_BOOL(file_rotate_now, rotate, PLUGIN_VAR_OPCMDARG,
"Force log rotation now.", NULL, rotate_log, FALSE);
"Force log rotation now", NULL, rotate_log, FALSE);
static MYSQL_SYSVAR_BOOL(logging, logging,
PLUGIN_VAR_OPCMDARG, "Turn on/off the logging.", NULL,
PLUGIN_VAR_OPCMDARG, "Turn on/off the logging", NULL,
update_logging, 0);
static MYSQL_SYSVAR_UINT(mode, mode,
PLUGIN_VAR_OPCMDARG, "Auditing mode.", NULL, update_mode, 0, 0, 1, 1);
PLUGIN_VAR_OPCMDARG, "Auditing mode", NULL, update_mode, 0, 0, 1, 1);
static MYSQL_SYSVAR_STR(syslog_ident, syslog_ident, PLUGIN_VAR_RQCMDARG,
"The SYSLOG identifier - the beginning of each SYSLOG record.",
"The SYSLOG identifier - the beginning of each SYSLOG record",
NULL, update_syslog_ident, syslog_ident_buffer);
static MYSQL_SYSVAR_STR(syslog_info, syslog_info,
PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_MEMALLOC,
"The <info> string to be added to the SYSLOG record.", NULL, NULL, "");
"The <info> string to be added to the SYSLOG record", NULL, NULL, "");
static MYSQL_SYSVAR_UINT(query_log_limit, query_log_limit,
PLUGIN_VAR_OPCMDARG, "Limit on the length of the query string in a record.",
PLUGIN_VAR_OPCMDARG, "Limit on the length of the query string in a record",
NULL, NULL, 1024, 0, 0x7FFFFFFF, 1);
char locinfo_ini_value[sizeof(struct connection_info)+4];
@@ -494,7 +494,7 @@ static TYPELIB syslog_facility_typelib=
};
static MYSQL_SYSVAR_ENUM(syslog_facility, syslog_facility, PLUGIN_VAR_RQCMDARG,
"The 'facility' parameter of the SYSLOG record."
" The default is LOG_USER.", 0, update_syslog_facility, 0/*LOG_USER*/,
" The default is LOG_USER", 0, update_syslog_facility, 0/*LOG_USER*/,
&syslog_facility_typelib);
static const char *syslog_priority_names[]=
@@ -519,7 +519,7 @@ static TYPELIB syslog_priority_typelib=
};
static MYSQL_SYSVAR_ENUM(syslog_priority, syslog_priority, PLUGIN_VAR_RQCMDARG,
"The 'priority' parameter of the SYSLOG record."
" The default is LOG_INFO.", 0, update_syslog_priority, 6/*LOG_INFO*/,
" The default is LOG_INFO", 0, update_syslog_priority, 6/*LOG_INFO*/,
&syslog_priority_typelib);

6
plugin/sql_errlog/sql_errlog.c
View File

@@ -50,7 +50,7 @@ static void rotate_log(MYSQL_THD thd, struct st_mysql_sys_var *var,
void *var_ptr, const void *save);
static MYSQL_SYSVAR_UINT(rate, rate, PLUGIN_VAR_RQCMDARG,
"Sampling rate. If set to 0(zero), the logging is disabled.", NULL, NULL,
"Sampling rate. If set to 0(zero), the logging is disabled", NULL, NULL,
1, 0, 1000000, 1);
static MYSQL_SYSVAR_ULONGLONG(size_limit, size_limit,
@@ -58,7 +58,7 @@ static MYSQL_SYSVAR_ULONGLONG(size_limit, size_limit,
1000000, 100, ((long long) 0x7FFFFFFFFFFFFFFFLL), 1);
static MYSQL_SYSVAR_UINT(rotations, rotations,
PLUGIN_VAR_READONLY, "Number of rotations before log is removed.",
PLUGIN_VAR_READONLY, "Number of rotations before log is removed",
NULL, NULL, 9, 1, 999, 1);
static MYSQL_SYSVAR_BOOL(rotate, rotate,
@@ -72,7 +72,7 @@ static MYSQL_SYSVAR_STR(filename, filename,
static MYSQL_SYSVAR_BOOL(warnings, warnings,
PLUGIN_VAR_OPCMDARG,
"Warnings. If set to 0, warnings are not logged.",
"Warnings. If set to 0, warnings are not logged",
NULL, NULL, 1);
static MYSQL_SYSVAR_BOOL(with_db_and_thread_info, with_db_and_thread_info,

6
plugin/test_sql_service/test_sql_service.c
View File

@@ -44,17 +44,17 @@ static void noop_update(MYSQL_THD thd, struct st_mysql_sys_var *var,
static MYSQL_SYSVAR_BOOL(run_test, do_test,
PLUGIN_VAR_OPCMDARG,
"Perform the test now.",
"Perform the test now",
run_test, NULL, 0);
static MYSQL_SYSVAR_STR(execute_sql_local, sql_text_local,
PLUGIN_VAR_OPCMDARG,
"Create the new local connection, execute SQL statement with it.",
"Create the new local connection, execute SQL statement with it",
run_sql_local, noop_update, 0);
static MYSQL_SYSVAR_STR(execute_sql_global, sql_text_global,
PLUGIN_VAR_OPCMDARG,
"Execute SQL statement using the global connection.",
"Execute SQL statement using the global connection",
run_sql_global, noop_update, 0);
static struct st_mysql_sys_var* test_sql_vars[]=

2
sql/log.cc
View File

@@ -12516,7 +12516,7 @@ static MYSQL_SYSVAR_BOOL(
"thread scheduling. On by default. Disable to run each transaction in group "
"commit in its own thread, which can be slower at very high concurrency. "
"This option is mostly for testing one algorithm versus the other, and it "
"should not normally be necessary to change it.",
"should not normally be necessary to change it",
NULL,
NULL,
1);

217
sql/mysqld.cc
View File

@@ -812,87 +812,87 @@ static struct my_option pfs_early_options[]=
{
#ifdef WITH_PERFSCHEMA_STORAGE_ENGINE
{"performance_schema_instrument", OPT_PFS_INSTRUMENT,
"Default startup value for a performance schema instrument.",
"Default startup value for a performance schema instrument",
&pfs_param.m_pfs_instrument, &pfs_param.m_pfs_instrument, 0, GET_STR,
OPT_ARG, 0, 0, 0, 0, 0, 0},
{"performance_schema_consumer_events_stages_current", 0,
"Default startup value for the events_stages_current consumer.",
"Default startup value for the events_stages_current consumer",
&pfs_param.m_consumer_events_stages_current_enabled,
&pfs_param.m_consumer_events_stages_current_enabled, 0, GET_BOOL,
OPT_ARG, FALSE, 0, 0, 0, 0, 0},
{"performance_schema_consumer_events_stages_history", 0,
"Default startup value for the events_stages_history consumer.",
"Default startup value for the events_stages_history consumer",
&pfs_param.m_consumer_events_stages_history_enabled,
&pfs_param.m_consumer_events_stages_history_enabled, 0,
GET_BOOL, OPT_ARG, FALSE, 0, 0, 0, 0, 0},
{"performance_schema_consumer_events_stages_history_long", 0,
"Default startup value for the events_stages_history_long consumer.",
"Default startup value for the events_stages_history_long consumer",
&pfs_param.m_consumer_events_stages_history_long_enabled,
&pfs_param.m_consumer_events_stages_history_long_enabled, 0,
GET_BOOL, OPT_ARG, FALSE, 0, 0, 0, 0, 0},
{"performance_schema_consumer_events_statements_current", 0,
"Default startup value for the events_statements_current consumer.",
"Default startup value for the events_statements_current consumer",
&pfs_param.m_consumer_events_statements_current_enabled,
&pfs_param.m_consumer_events_statements_current_enabled, 0, GET_BOOL,
OPT_ARG, FALSE, 0, 0, 0, 0, 0},
{"performance_schema_consumer_events_statements_history", 0,
"Default startup value for the events_statements_history consumer.",
"Default startup value for the events_statements_history consumer",
&pfs_param.m_consumer_events_statements_history_enabled,
&pfs_param.m_consumer_events_statements_history_enabled, 0,
GET_BOOL, OPT_ARG, FALSE, 0, 0, 0, 0, 0},
{"performance_schema_consumer_events_statements_history_long", 0,
"Default startup value for the events_statements_history_long consumer.",
"Default startup value for the events_statements_history_long consumer",
&pfs_param.m_consumer_events_statements_history_long_enabled,
&pfs_param.m_consumer_events_statements_history_long_enabled, 0,
GET_BOOL, OPT_ARG, FALSE, 0, 0, 0, 0, 0},
{"performance_schema_consumer_events_transactions_current", 0,
"Default startup value for the events_transactions_current consumer.",
"Default startup value for the events_transactions_current consumer",
&pfs_param.m_consumer_events_transactions_current_enabled,
&pfs_param.m_consumer_events_transactions_current_enabled, 0,
GET_BOOL, OPT_ARG, FALSE, 0, 0, 0, 0, 0},
{"performance_schema_consumer_events_transactions_history", 0,
"Default startup value for the events_transactions_history consumer.",
"Default startup value for the events_transactions_history consumer",
&pfs_param.m_consumer_events_transactions_history_enabled,
&pfs_param.m_consumer_events_transactions_history_enabled, 0,
GET_BOOL, OPT_ARG, FALSE, 0, 0, 0, 0, 0},
{"performance_schema_consumer_events_transactions_history_long", 0,
"Default startup value for the events_transactions_history_long consumer.",
"Default startup value for the events_transactions_history_long consumer",
&pfs_param.m_consumer_events_transactions_history_long_enabled,
&pfs_param.m_consumer_events_transactions_history_long_enabled, 0,
GET_BOOL, OPT_ARG, FALSE, 0, 0, 0, 0, 0},
{"performance_schema_consumer_events_waits_current", 0,
"Default startup value for the events_waits_current consumer.",
"Default startup value for the events_waits_current consumer",
&pfs_param.m_consumer_events_waits_current_enabled,
&pfs_param.m_consumer_events_waits_current_enabled, 0,
GET_BOOL, OPT_ARG, FALSE, 0, 0, 0, 0, 0},
{"performance_schema_consumer_events_waits_history", 0,
"Default startup value for the events_waits_history consumer.",
"Default startup value for the events_waits_history consumer",
&pfs_param.m_consumer_events_waits_history_enabled,
&pfs_param.m_consumer_events_waits_history_enabled, 0,
GET_BOOL, OPT_ARG, FALSE, 0, 0, 0, 0, 0},
{"performance_schema_consumer_events_waits_history_long", 0,
"Default startup value for the events_waits_history_long consumer.",
"Default startup value for the events_waits_history_long consumer",
&pfs_param.m_consumer_events_waits_history_long_enabled,
&pfs_param.m_consumer_events_waits_history_long_enabled, 0,
GET_BOOL, OPT_ARG, FALSE, 0, 0, 0, 0, 0},
{"performance_schema_consumer_global_instrumentation", 0,
"Default startup value for the global_instrumentation consumer.",
"Default startup value for the global_instrumentation consumer",
&pfs_param.m_consumer_global_instrumentation_enabled,
&pfs_param.m_consumer_global_instrumentation_enabled, 0,
GET_BOOL, OPT_ARG, TRUE, 0, 0, 0, 0, 0},
{"performance_schema_consumer_thread_instrumentation", 0,
"Default startup value for the thread_instrumentation consumer.",
"Default startup value for the thread_instrumentation consumer",
&pfs_param.m_consumer_thread_instrumentation_enabled,
&pfs_param.m_consumer_thread_instrumentation_enabled, 0,
GET_BOOL, OPT_ARG, TRUE, 0, 0, 0, 0, 0},
{"performance_schema_consumer_statements_digest", 0,
"Default startup value for the statements_digest consumer.",
"Default startup value for the statements_digest consumer",
&pfs_param.m_consumer_statement_digest_enabled,
&pfs_param.m_consumer_statement_digest_enabled, 0,
GET_BOOL, OPT_ARG, TRUE, 0, 0, 0, 0, 0},
#endif /* WITH_PERFSCHEMA_STORAGE_ENGINE */
{"getopt-prefix-matching", 0,
"Recognize command-line options by their unambiguos prefixes.",
"Recognize command-line options by their unambiguos prefixes",
&my_getopt_prefix_matching, &my_getopt_prefix_matching, 0, GET_BOOL,
NO_ARG, 1, 0, 1, 0, 0, 0}
};
@@ -6448,11 +6448,11 @@ int handle_early_options()
struct my_option my_long_options[]=
{
{"help", '?', "Display this help and exit.",
{"help", '?', "Display this help and exit",
&opt_help, &opt_help, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0,
0, 0},
{"ansi", 'a', "Use ANSI SQL syntax instead of MySQL syntax. This mode "
"will also set transaction isolation level 'serializable'.", 0, 0, 0,
"will also set transaction isolation level 'serializable'", 0, 0, 0,
GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
/*
Because Sys_var_bit does not support command-line options, we need to
@@ -6463,48 +6463,48 @@ struct my_option my_long_options[]=
GET_BOOL, OPT_ARG, 1, 0, 0, 0, 0, NULL},
{"binlog-do-db", OPT_BINLOG_DO_DB,
"Tells the master it should log updates for the specified database, "
"and exclude all others not explicitly mentioned.",
"and exclude all others not explicitly mentioned",
0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
{"binlog-ignore-db", OPT_BINLOG_IGNORE_DB,
"Tells the master that updates to the given database should not be logged to the binary log.",
"Tells the master that updates to the given database should not be logged to the binary log",
0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
#ifndef DISABLE_GRANT_OPTIONS
{"bootstrap", OPT_BOOTSTRAP, "Used by mysql installation scripts.", 0, 0, 0,
{"bootstrap", OPT_BOOTSTRAP, "Used by mysql installation scripts", 0, 0, 0,
GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
#endif
{"character-set-client-handshake", 0,
"Don't ignore client side character set value sent during handshake.",
"Don't ignore client side character set value sent during handshake",
&opt_character_set_client_handshake,
&opt_character_set_client_handshake,
0, GET_BOOL, NO_ARG, 1, 0, 0, 0, 0, 0},
{"character-set-filesystem", 0,
"Set the filesystem character set.",
"Set the filesystem character set",
&character_set_filesystem_name,
&character_set_filesystem_name,
0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 },
{"character-set-server", 'C', "Set the default character set.",
{"character-set-server", 'C', "Set the default character set",
&default_character_set_name, &default_character_set_name,
0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 },
{"chroot", 'r', "Chroot mysqld daemon during startup.",
{"chroot", 'r', "Chroot mysqld daemon during startup",
&mysqld_chroot, &mysqld_chroot, 0, GET_STR, REQUIRED_ARG,
0, 0, 0, 0, 0, 0},
{"collation-server", 0, "Set the default collation.",
{"collation-server", 0, "Set the default collation",
&default_collation_name, &default_collation_name,
0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 },
{"character-set-collations", 0, "Overrides for character set default collations.",
{"character-set-collations", 0, "Overrides for character set default collations",
&character_set_collations_str, &character_set_collations_str,
0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 },
{"console", OPT_CONSOLE, "Write error output on screen; don't remove the console window on windows.",
{"console", OPT_CONSOLE, "Write error output on screen; don't remove the console window on windows",
&opt_console, &opt_console, 0, GET_BOOL, NO_ARG, 0, 0, 0,
0, 0, 0},
#ifdef DBUG_OFF
{"debug", '#', "Built in DBUG debugger. Disabled in this build.",
{"debug", '#', "Built in DBUG debugger. Disabled in this build",
&current_dbug_option, &current_dbug_option, 0, GET_STR, OPT_ARG,
0, 0, 0, 0, 0, 0},
#endif
#ifdef HAVE_REPLICATION
{"debug-abort-slave-event-count", 0,
"Option used by mysql-test for debugging and testing of replication.",
"Option used by mysql-test for debugging and testing of replication",
&abort_slave_event_count, &abort_slave_event_count,
0, GET_INT, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
#endif /* HAVE_REPLICATION */
@@ -6524,19 +6524,19 @@ struct my_option my_long_options[]=
#endif
#ifdef HAVE_REPLICATION
{"debug-disconnect-slave-event-count", 0,
"Option used by mysql-test for debugging and testing of replication.",
"Option used by mysql-test for debugging and testing of replication",
&disconnect_slave_event_count, &disconnect_slave_event_count,
0, GET_INT, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
#endif /* HAVE_REPLICATION */
{"debug-exit-info", 'T', "Used for debugging. Use at your own risk.",
{"debug-exit-info", 'T', "Used for debugging. Use at your own risk",
0, 0, 0, GET_LONG, OPT_ARG, 0, 0, 0, 0, 0, 0},
{"debug-gdb", 0,
"Set up signals usable for debugging.",
"Set up signals usable for debugging",
&opt_debugging, &opt_debugging,
0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
#ifdef HAVE_REPLICATION
{"debug-max-binlog-dump-events", 0,
"Option used by mysql-test for debugging and testing of replication.",
"Option used by mysql-test for debugging and testing of replication",
&max_binlog_dump_events, &max_binlog_dump_events, 0,
GET_INT, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
#endif /* HAVE_REPLICATION */
@@ -6545,7 +6545,7 @@ struct my_option my_long_options[]=
&my_disable_sync, &my_disable_sync, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
#ifdef HAVE_REPLICATION
{"debug-sporadic-binlog-dump-fail", 0,
"Option used by mysql-test for debugging and testing of replication.",
"Option used by mysql-test for debugging and testing of replication",
&opt_sporadic_binlog_dump_fail,
&opt_sporadic_binlog_dump_fail, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0,
0},
@@ -6567,20 +6567,20 @@ struct my_option my_long_options[]=
"The default storage engine for user-created temporary tables",
&default_tmp_storage_engine, 0, 0, GET_STR, REQUIRED_ARG,
0, 0, 0, 0, 0, 0 },
{"default-time-zone", 0, "Set the default time zone.",
{"default-time-zone", 0, "Set the default time zone",
&default_tz_name, &default_tz_name,
0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 },
#if defined(ENABLED_DEBUG_SYNC)
{"debug-sync-timeout", OPT_DEBUG_SYNC_TIMEOUT,
"Enable the debug sync facility "
"and optionally specify a default wait timeout in seconds. "
"A zero value keeps the facility disabled.",
"A zero value keeps the facility disabled",
&opt_debug_sync_timeout, 0,
0, GET_UINT, OPT_ARG, 0, 0, UINT_MAX, 0, 0, 0},
#endif /* defined(ENABLED_DEBUG_SYNC) */
#ifdef HAVE_des
{"des-key-file", 0,
"Load keys for des_encrypt() and des_encrypt from given file.",
"Load keys for des_encrypt() and des_encrypt from given file",
&des_key_file, &des_key_file, 0, GET_STR, REQUIRED_ARG,
0, 0, 0, 0, 0, 0},
#endif /* HAVE_des */
@@ -6594,7 +6594,7 @@ struct my_option my_long_options[]=
{"external-locking", 0, "Use system (external) locking (disabled by "
"default). With this option enabled you can run myisamchk to test "
"(not repair) tables while the MySQL server is running. Disable with "
"--skip-external-locking.", &opt_external_locking, &opt_external_locking,
"--skip-external-locking", &opt_external_locking, &opt_external_locking,
0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
/* We must always support the next option to make scripts like mysqltest
easier to do */
@@ -6603,9 +6603,9 @@ struct my_option my_long_options[]=
&opt_support_flashback, &opt_support_flashback,
0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
{"gdb", 0,
"Set up signals usable for debugging. Deprecated, use --debug-gdb instead.",
"Set up signals usable for debugging",
&opt_debugging, &opt_debugging,
0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
0, GET_BOOL, NO_ARG, 0, 0, 0, "debug_gdb", 0, 0},
{"gtid-pos-auto-engines", 0,
"List of engines for which to automatically create a "
"mysql.gtid_slave_pos_ENGINE table, if a transaction using that engine "
@@ -6615,21 +6615,19 @@ struct my_option my_long_options[]=
&gtid_pos_auto_engines, 0, 0, GET_STR, REQUIRED_ARG,
0, 0, 0, 0, 0, 0 },
#ifdef HAVE_SOLARIS_LARGE_PAGES
{"super-large-pages", 0, "Enable support for super large pages.",
{"super-large-pages", 0, "Enable support for super large pages",
&opt_super_large_pages, &opt_super_large_pages, 0,
GET_BOOL, OPT_ARG, 0, 0, 1, 0, 1, 0},
#endif
{"language", 'L',
"Client error messages in given language. May be given as a full path. "
"Deprecated. Use --lc-messages-dir instead.",
0, 0, 0,
GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
"Client error messages in given language. May be given as a full path",
0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, "lc_messages_dir", 0, 0},
{"lc-messages", 0,
"Set the language used for the error messages.",
"Set the language used for the error messages",
&lc_messages, &lc_messages, 0, GET_STR, REQUIRED_ARG,
0, 0, 0, 0, 0, 0 },
{"lc-time-names", 0,
"Set the language used for the month names and the days of the week.",
"Set the language used for the month names and the days of the week",
&lc_time_names_name, &lc_time_names_name,
0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 },
{"log-basename", OPT_LOG_BASENAME,
@@ -6646,11 +6644,11 @@ struct my_option my_long_options[]=
"'datadir'/'log-basename'-bin or 'datadir'/mysql-bin will be used (the later if "
"--log-basename is not specified). We strongly recommend to use either "
"--log-basename or specify a filename to ensure that replication doesn't "
"stop if the real hostname of the computer changes.",
"stop if the real hostname of the computer changes",
&opt_bin_logname, &opt_bin_logname, 0, GET_STR,
OPT_ARG, 0, 0, 0, 0, 0, 0},
{"log-bin-index", 0,
"File that holds the names for last binary log files.",
"File that holds the names for last binary log files",
&opt_binlog_index_name, &opt_binlog_index_name, 0, GET_STR,
REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
{"relay-log-index", 0,
@@ -6662,16 +6660,16 @@ struct my_option my_long_options[]=
"Path to file used for recovery of DDL statements after a crash",
&opt_ddl_recovery_file, &opt_ddl_recovery_file, 0, GET_STR,
REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
{"log-isam", OPT_ISAM_LOG, "Log all MyISAM changes to file.",
{"log-isam", OPT_ISAM_LOG, "Log all MyISAM changes to file",
&myisam_log_filename, &myisam_log_filename, 0, GET_STR,
OPT_ARG, 0, 0, 0, 0, 0, 0},
{"log-short-format", 0,
"Don't log extra information to update and slow-query logs.",
"Don't log extra information to update and slow-query logs",
&opt_short_log_format, &opt_short_log_format,
0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
{"log-tc", 0,
"Path to transaction coordinator log (used for transactions that affect "
"more than one storage engine, when binary log is disabled).",
"more than one storage engine, when binary log is disabled)",
&opt_tc_log_file, &opt_tc_log_file, 0, GET_STR,
REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
{"master-info-file", 0,
@@ -6681,7 +6679,7 @@ struct my_option my_long_options[]=
&master_info_file, &master_info_file, 0, GET_STR,
REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
{"master-retry-count", 0,
"The number of tries the slave will make to connect to the master before giving up.",
"The number of tries the slave will make to connect to the master before giving up",
&master_retry_count, &master_retry_count, 0, GET_ULONG,
REQUIRED_ARG, 100000, 0, 0, 0, 0, 0},
#ifdef HAVE_REPLICATION
@@ -6689,16 +6687,16 @@ struct my_option my_long_options[]=
&rpl_status, &rpl_status, &rpl_role_typelib,
GET_ENUM, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
#endif /* HAVE_REPLICATION */
{"memlock", 0, "Lock mysqld in memory.", &locked_in_memory,
{"memlock", 0, "Lock mysqld in memory", &locked_in_memory,
&locked_in_memory, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
{"old-style-user-limits", 0,
"Enable old-style user limits (before 5.0.3, user resources were counted "
"per each user+host vs. per account).",
"per each user+host vs. per account)",
&opt_old_style_user_limits, &opt_old_style_user_limits,
0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
{"port-open-timeout", 0,
"Maximum time in seconds to wait for the port to become free. "
"(Default: No wait).", &mysqld_port_timeout, &mysqld_port_timeout, 0,
"(Default: No wait)", &mysqld_port_timeout, &mysqld_port_timeout, 0,
GET_UINT, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
{"replicate-do-db", OPT_REPLICATE_DO_DB,
"Tells the slave thread to restrict replication to the specified database. "
@@ -6707,13 +6705,13 @@ struct my_option my_long_options[]=
"cross-database queries such as UPDATE some_db.some_table SET foo='bar' "
"while having selected a different or no database. If you need cross "
"database updates to work, make sure you have 3.23.28 or later, and use "
"replicate-wild-do-table=db_name.%.",
"replicate-wild-do-table=db_name.%",
0, 0, 0, GET_STR | GET_ASK_ADDR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
{"replicate-do-table", OPT_REPLICATE_DO_TABLE,
"Tells the slave thread to restrict replication to the specified table. "
"To specify more than one table, use the directive multiple times, once "
"for each table. This will work for cross-database updates, in contrast "
"to replicate-do-db.", 0, 0, 0, GET_STR | GET_ASK_ADDR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
"to replicate-do-db", 0, 0, 0, GET_STR | GET_ASK_ADDR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
{"replicate-ignore-db", OPT_REPLICATE_IGNORE_DB,
"Tells the slave thread to not replicate to the specified database. To "
"specify more than one database to ignore, use the directive multiple "
@@ -6725,16 +6723,16 @@ struct my_option my_long_options[]=
"Tells the slave thread to not replicate to the specified table. To specify "
"more than one table to ignore, use the directive multiple times, once for "
"each table. This will work for cross-database updates, in contrast to "
"replicate-ignore-db.", 0, 0, 0, GET_STR | GET_ASK_ADDR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
"replicate-ignore-db", 0, 0, 0, GET_STR | GET_ASK_ADDR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
{"replicate-rewrite-db", OPT_REPLICATE_REWRITE_DB,
"Updates to a database with a different name than the original. Example: "
"replicate-rewrite-db=master_db_name->slave_db_name.",
"replicate-rewrite-db=master_db_name->slave_db_name",
0, 0, 0, GET_STR | GET_ASK_ADDR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
#ifdef HAVE_REPLICATION
{"replicate-same-server-id", 0,
"In replication, if set to 1, do not skip events having our server id. "
"Default value is 0 (to break infinite loops in circular replication). "
"Can't be set to 1 if --log-slave-updates is used.",
"Can't be set to 1 if --log-slave-updates is used",
&replicate_same_server_id, &replicate_same_server_id,
0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
#endif
@@ -6744,7 +6742,7 @@ struct my_option my_long_options[]=
"directive multiple times, once for each table. This will work for cross-"
"database updates. Example: replicate-wild-do-table=foo%.bar% will "
"replicate only updates to tables in all databases that start with foo "
"and whose table names start with bar.",
"and whose table names start with bar",
0, 0, 0, GET_STR | GET_ASK_ADDR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
{"replicate-wild-ignore-table", OPT_REPLICATE_WILD_IGNORE_TABLE,
"Tells the slave thread to not replicate to the tables that match the "
@@ -6752,24 +6750,24 @@ struct my_option my_long_options[]=
"the directive multiple times, once for each table. This will work for "
"cross-database updates. Example: replicate-wild-ignore-table=foo%.bar% "
"will not do updates to tables in databases that start with foo and whose "
"table names start with bar.",
"table names start with bar",
0, 0, 0, GET_STR | GET_ASK_ADDR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
{"safe-mode", OPT_SAFE, "Skip some optimize stages (for testing). Deprecated.",
0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
{"safe-mode", OPT_SAFE, "Skip some optimize stages (for testing)",
0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, "", 0, 0},
{"safe-user-create", 0,
"Don't allow new user creation by the user who has no write privileges to the mysql.user table.",
"Don't allow new user creation by the user who has no write privileges to the mysql.user table",
&opt_safe_user_create, &opt_safe_user_create, 0, GET_BOOL,
NO_ARG, 0, 0, 0, 0, 0, 0},
{"show-slave-auth-info", 0,
"Show user and password in SHOW SLAVE HOSTS on this master.",
"Show user and password in SHOW SLAVE HOSTS on this master",
&opt_show_slave_auth_info, &opt_show_slave_auth_info, 0,
GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
{"silent-startup", OPT_SILENT, "Don't print [Note] to the error log during startup.",
{"silent-startup", OPT_SILENT, "Don't print [Note] to the error log during startup",
&opt_silent_startup, &opt_silent_startup, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
{"skip-host-cache", OPT_SKIP_HOST_CACHE, "Don't cache host names.", 0, 0, 0,
{"skip-host-cache", OPT_SKIP_HOST_CACHE, "Don't cache host names", 0, 0, 0,
GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
{"skip-slave-start", 0,
"If set, slave is not autostarted.", &opt_skip_slave_start,
"If set, slave is not autostarted", &opt_skip_slave_start,
&opt_skip_slave_start, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
#ifdef HAVE_REPLICATION
{"slave-parallel-mode", OPT_SLAVE_PARALLEL_MODE,
@@ -6780,7 +6778,7 @@ struct my_option my_long_options[]=
"effort to avoid any conflicts. \"aggressive\" tries to maximise the "
"parallelism, possibly at the cost of increased conflict rate. "
"\"minimal\" only parallelizes the commit steps of transactions. "
"\"none\" disables parallel apply completely.",
"\"none\" disables parallel apply completely",
&opt_slave_parallel_mode, &opt_slave_parallel_mode,
&slave_parallel_mode_typelib, GET_ENUM | GET_ASK_ADDR, REQUIRED_ARG,
SLAVE_PARALLEL_CONSERVATIVE, 0, 0, 0, 0, 0},
@@ -6789,21 +6787,21 @@ struct my_option my_long_options[]=
{"slow-start-timeout", 0,
"Maximum number of milliseconds that the service control manager should wait "
"before trying to kill the windows service during startup"
"(Default: 15000).", &slow_start_timeout, &slow_start_timeout, 0,
"(Default: 15000)", &slow_start_timeout, &slow_start_timeout, 0,
GET_ULONG, REQUIRED_ARG, 15000, 0, 0, 0, 0, 0},
#endif
#ifdef HAVE_OPENSSL
{"ssl", 0,
"Enable SSL for connection (automatically enabled if an ssl option is used).",
"Enable SSL for connection (automatically enabled if an ssl option is used)",
&opt_use_ssl, &opt_use_ssl, 0, GET_BOOL, OPT_ARG, 1, 0, 0,
0, 0, 0},
#endif
#ifdef _WIN32
{"standalone", 0,
"Dummy option to start as a standalone program (NT).", 0, 0, 0, GET_NO_ARG,
"Dummy option to start as a standalone program (NT)", 0, 0, 0, GET_NO_ARG,
NO_ARG, 0, 0, 0, 0, 0, 0},
#endif
{"symbolic-links", 's', "Enable symbolic link support.",
{"symbolic-links", 's', "Enable symbolic link support",
&my_use_symdir, &my_use_symdir, 0, GET_BOOL, NO_ARG,
/*
The system call realpath() produces warnings under valgrind and
@@ -6816,7 +6814,7 @@ struct my_option my_long_options[]=
{"sysdate-is-now", 0,
"Non-default option to alias SYSDATE() to NOW() to make it safe-replicable. "
"Since 5.0, SYSDATE() returns a `dynamic' value different for different "
"invocations, even within the same statement.",
"invocations, even within the same statement",
&global_system_variables.sysdate_is_now,
0, 0, GET_BOOL, NO_ARG, 0, 0, 1, 0, 1, 0},
{"tc-heuristic-recover", 0,
@@ -6826,9 +6824,9 @@ struct my_option my_long_options[]=
{"temp-pool", 0,
#if (ENABLE_TEMP_POOL)
"Using this option will cause most temporary files created to use a small "
"set of names, rather than a unique name for each new file. Deprecated.",
"set of names, rather than a unique name for each new file. Deprecated",
#else
"This option is ignored on this OS.",
"This option is ignored on this OS",
#endif
&use_temp_pool, &use_temp_pool, 0, GET_BOOL, NO_ARG, 0,
0, 0, 0, 0, 0},
@@ -6839,36 +6837,36 @@ struct my_option my_long_options[]=
GET_ENUM, REQUIRED_ARG, ISO_REPEATABLE_READ, 0, 0, 0, 0, 0},
{"transaction-read-only", 0,
"Default transaction access mode. "
"True if transactions are read-only.",
"True if transactions are read-only",
&global_system_variables.tx_read_only,
&global_system_variables.tx_read_only, 0,
GET_BOOL, OPT_ARG, 0, 0, 0, 0, 0, 0},
{"user", 'u', "Run mysqld daemon as user.", 0, 0, 0, GET_STR, REQUIRED_ARG,
{"user", 'u', "Run mysqld daemon as user", 0, 0, 0, GET_STR, REQUIRED_ARG,
0, 0, 0, 0, 0, 0},
{"verbose", 'v', "Used with --help option for detailed help.",
{"verbose", 'v', "Used with --help option for detailed help",
&opt_verbose, &opt_verbose, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
{"version", 'V', "Output version information and exit.", 0, 0, 0, GET_STR,
{"version", 'V', "Output version information and exit", 0, 0, 0, GET_STR,
OPT_ARG, 0, 0, 0, 0, 0, 0},
{"plugin-load", OPT_PLUGIN_LOAD,
"Semicolon-separated list of plugins to load, where each plugin is "
"specified as ether a plugin_name=library_file pair or only a library_file. "
"If the latter case, all plugins from a given library_file will be loaded.",
"If the latter case, all plugins from a given library_file will be loaded",
0, 0, 0,
GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
{"plugin-load-add", OPT_PLUGIN_LOAD_ADD,
"Optional semicolon-separated list of plugins to load. This option adds "
"to the list specified by --plugin-load in an incremental way. "
"It can be specified many times, adding more plugins every time.",
"It can be specified many times, adding more plugins every time",
0, 0, 0,
GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
{"table_cache", 0, "Deprecated; use --table-open-cache instead.",
{"table_cache", 0, "Sets table_open_cache",
&tc_size, &tc_size, 0, GET_ULONG,
REQUIRED_ARG, TABLE_OPEN_CACHE_DEFAULT, 1, 512*1024L, 0, 1, 0},
REQUIRED_ARG, TABLE_OPEN_CACHE_DEFAULT, 1, 512*1024L, "table_open_cache", 1, 0},
#ifdef WITH_WSREP
{"wsrep-new-cluster", 0, "Bootstrap a cluster. It works by overriding the "
"current value of wsrep_cluster_address. It is recommended not to add this "
"option to the config file as this will trigger bootstrap on every server "
"start.", &wsrep_new_cluster, &wsrep_new_cluster, 0, GET_BOOL, NO_ARG,
"start", &wsrep_new_cluster, &wsrep_new_cluster, 0, GET_BOOL, NO_ARG,
0, 0, 0, 0, 0, 0},
#endif
};
@@ -7686,24 +7684,8 @@ static void print_version(void)
/** Compares two options' names, treats - and _ the same */
static int option_cmp(my_option *a, my_option *b)
{
bool deprecated_a= false, deprecated_b= false;
const char *sa= a->name;
if (a->deprecation_substitute != NULL &&
!IS_DEPRECATED_NO_REPLACEMENT(a->deprecation_substitute))
{
sa= a->deprecation_substitute;
deprecated_a= true;
}
const char *sb= b->name;
if (b->deprecation_substitute != NULL &&
!IS_DEPRECATED_NO_REPLACEMENT(b->deprecation_substitute))
{
sb= b->deprecation_substitute;
deprecated_b= true;
}
for (; *sa || *sb; sa++, sb++)
{
if (*sa < *sb)
@@ -7721,13 +7703,6 @@ static int option_cmp(my_option *a, my_option *b)
return 1;
}
}
if (deprecated_a)
return -1;
if (deprecated_b)
return 1;
return 0;
}
@@ -8296,8 +8271,6 @@ mysqld_get_one_option(const struct my_option *opt, const char *argument,
#ifdef HAVE_QUERY_CACHE
SYSVAR_AUTOSIZE(query_cache_size, 0);
#endif
sql_print_warning("The syntax '--safe-mode' is deprecated and will be "
"removed in a future release.");
break;
case (int) OPT_SKIP_HOST_CACHE:
opt_specialflag|= SPECIAL_NO_HOST_CACHE;
@@ -8454,20 +8427,6 @@ mysqld_get_one_option(const struct my_option *opt, const char *argument,
}
}
if (opt->deprecation_substitute != NULL) {
if (IS_DEPRECATED_NO_REPLACEMENT(opt->deprecation_substitute))
sql_print_warning("\'%s\' is deprecated and will be removed in a future release", opt->name);
else
{
char buf1[NAME_CHAR_LEN + 3];
strxmov(buf1, "--", opt->deprecation_substitute, NullS);
convert_underscore_to_dash(buf1, strlen(opt->deprecation_substitute) + 2);
sql_print_warning("\'%s\' is deprecated and will be removed in a future release. Please use %s instead", opt->name, buf1);
}
}
return 0;
}
@@ -8679,8 +8638,6 @@ static int get_options(int *argc_ptr, char ***argv_ptr)
global_system_variables.old_behavior|= (OLD_MODE_NO_PROGRESS_INFO |
OLD_MODE_IGNORE_INDEX_ONLY_FOR_JOIN |
OLD_MODE_COMPAT_5_1_CHECKSUM);
sql_print_warning("--old is deprecated and will be removed in a future "
"release. Please use --old-mode instead. ");
}
if (global_system_variables.net_buffer_length >

2
sql/set_var.cc
View File

@@ -170,6 +170,8 @@ sys_var::sys_var(sys_var_chain *chain, const char *name_arg,
name.str= name_arg; // ER_NO_DEFAULT relies on 0-termination of name_arg
name.length= strlen(name_arg); // and so does this.
DBUG_ASSERT(name.length <= NAME_CHAR_LEN);
DBUG_ASSERT(!comment || !comment[0] || comment[strlen(comment)-1] != '.');
DBUG_ASSERT(!comment || !comment[0] || comment[strlen(comment)-1] != ' ');
bzero(&option, sizeof(option));
option.name= name_arg;

436
sql/sys_vars.cc
View File

File diff suppressed because it is too large Load Diff

14
storage/connect/ha_connect.cc
View File

@@ -314,7 +314,7 @@ TYPELIB xtrace_typelib =
static MYSQL_THDVAR_SET(
xtrace, // name
PLUGIN_VAR_RQCMDARG, // opt
"Trace values.", // comment
"Trace values", // comment
NULL, // check
NULL, // update function
0, // def (NO)
@@ -352,7 +352,7 @@ TYPELIB usetemp_typelib=
static MYSQL_THDVAR_ENUM(
use_tempfile, // name
PLUGIN_VAR_RQCMDARG, // opt
"Temporary file use.", // comment
"Temporary file use", // comment
NULL, // check
NULL, // update function
1, // def (AUTO)
@@ -362,20 +362,20 @@ static MYSQL_THDVAR_ENUM(
// Size used for g->Sarea_Size
static MYSQL_THDVAR_ULONGLONG(work_size,
PLUGIN_VAR_RQCMDARG,
"Size of the CONNECT work area.",
"Size of the CONNECT work area",
NULL, NULL, SZWORK, SZWMIN, ULONGLONG_MAX, 1);
#else
// Size used for g->Sarea_Size
static MYSQL_THDVAR_ULONG(work_size,
PLUGIN_VAR_RQCMDARG,
"Size of the CONNECT work area.",
"Size of the CONNECT work area",
NULL, NULL, SZWORK, SZWMIN, ULONG_MAX, 1);
#endif
// Size used when converting TEXT columns to VARCHAR
static MYSQL_THDVAR_INT(conv_size,
PLUGIN_VAR_RQCMDARG, // opt
"Size used when converting TEXT columns.",
"Size used when converting TEXT columns",
NULL, NULL, SZCONV, 0, 65500, 1);
/**
@@ -399,7 +399,7 @@ TYPELIB xconv_typelib=
static MYSQL_THDVAR_ENUM(
type_conv, // name
PLUGIN_VAR_RQCMDARG, // opt
"Unsupported types conversion.", // comment
"Unsupported types conversion", // comment
NULL, // check
NULL, // update function
1, // def (yes)
@@ -432,7 +432,7 @@ static MYSQL_THDVAR_INT(default_prec,
// Estimate max number of rows for JSON aggregate functions
static MYSQL_THDVAR_UINT(json_grp_size,
PLUGIN_VAR_RQCMDARG, // opt
"max number of rows for JSON aggregate functions.",
"max number of rows for JSON aggregate functions",
NULL, NULL, JSONMAX, 1, INT_MAX, 1);
#if defined(JAVA_SUPPORT)

2
storage/example/ha_example.cc
View File

@@ -1010,7 +1010,7 @@ static MYSQL_SYSVAR_ENUM(
enum_var, // name
srv_enum_var, // varname
PLUGIN_VAR_RQCMDARG, // opt
"Sample ENUM system variable.", // comment
"Sample ENUM system variable", // comment
NULL, // check
NULL, // update
0, // def

128
storage/innobase/handler/ha_innodb.cc
View File

@@ -654,7 +654,7 @@ innodb_default_encryption_key_id_update(THD* thd, st_mysql_sys_var* var,
}
static MYSQL_THDVAR_UINT(default_encryption_key_id, PLUGIN_VAR_RQCMDARG,
"Default encryption key id used for table encryption.",
"Default encryption key id used for table encryption",
NULL, innodb_default_encryption_key_id_update,
FIL_DEFAULT_ENCRYPTION_KEY, 1, UINT_MAX32, 0);
@@ -871,30 +871,30 @@ static MYSQL_THDVAR_BOOL(table_locks, PLUGIN_VAR_OPCMDARG,
/* default */ TRUE);
static MYSQL_THDVAR_BOOL(snapshot_isolation, PLUGIN_VAR_OPCMDARG,
"Use snapshot isolation (write-write conflict detection).",
"Use snapshot isolation (write-write conflict detection)",
NULL, NULL, FALSE);
static MYSQL_THDVAR_BOOL(strict_mode, PLUGIN_VAR_OPCMDARG,
"Use strict mode when evaluating create options.",
"Use strict mode when evaluating create options",
NULL, NULL, TRUE);
static MYSQL_THDVAR_BOOL(ft_enable_stopword, PLUGIN_VAR_OPCMDARG,
"Create FTS index with stopword.",
"Create FTS index with stopword",
NULL, NULL,
/* default */ TRUE);
static MYSQL_THDVAR_UINT(lock_wait_timeout, PLUGIN_VAR_RQCMDARG,
"Timeout in seconds an InnoDB transaction may wait for a lock before being rolled back. The value 100000000 is infinite timeout.",
"Timeout in seconds an InnoDB transaction may wait for a lock before being rolled back. The value 100000000 is infinite timeout",
NULL, NULL, 50, 0, 100000000, 0);
static MYSQL_THDVAR_STR(ft_user_stopword_table,
PLUGIN_VAR_OPCMDARG|PLUGIN_VAR_MEMALLOC,
"User supplied stopword table name, effective in the session level.",
"User supplied stopword table name, effective in the session level",
innodb_stopword_table_validate, NULL, NULL);
static MYSQL_THDVAR_STR(tmpdir,
PLUGIN_VAR_OPCMDARG|PLUGIN_VAR_MEMALLOC,
"Directory for temporary non-tablespace files.",
"Directory for temporary non-tablespace files",
innodb_tmpdir_validate, NULL, NULL);
static size_t truncated_status_writes;
@@ -3652,7 +3652,7 @@ innodb_buffer_pool_size_update(
static MYSQL_SYSVAR_ULONGLONG(buffer_pool_size, innobase_buffer_pool_size,
PLUGIN_VAR_RQCMDARG,
"The size of the memory buffer InnoDB uses to cache data and indexes of its tables.",
"The size of the memory buffer InnoDB uses to cache data and indexes of its tables",
innodb_buffer_pool_size_validate,
innodb_buffer_pool_size_update,
128ULL << 20,
@@ -18747,7 +18747,7 @@ static MYSQL_SYSVAR_ENUM(checksum_algorithm, srv_checksum_algorithm,
static MYSQL_SYSVAR_STR(data_home_dir, innobase_data_home_dir,
PLUGIN_VAR_READONLY,
"The common part for InnoDB table spaces.",
"The common part for InnoDB table spaces",
NULL, NULL, NULL);
static MYSQL_SYSVAR_ENUM(doublewrite, buf_dblwr.use,
@@ -18762,7 +18762,7 @@ static MYSQL_SYSVAR_ENUM(doublewrite, buf_dblwr.use,
static MYSQL_SYSVAR_BOOL(use_atomic_writes, srv_use_atomic_writes,
PLUGIN_VAR_NOCMDARG | PLUGIN_VAR_READONLY,
"Enable atomic writes, instead of using the doublewrite buffer, for files "
"on devices that supports atomic writes.",
"on devices that supports atomic writes",
NULL, NULL, TRUE);
static MYSQL_SYSVAR_BOOL(stats_include_delete_marked,
@@ -18784,7 +18784,7 @@ static MYSQL_SYSVAR_ULONG(io_capacity, srv_io_capacity,
static MYSQL_SYSVAR_ULONG(io_capacity_max, srv_max_io_capacity,
PLUGIN_VAR_RQCMDARG,
"Limit to which innodb_io_capacity can be inflated.",
"Limit to which innodb_io_capacity can be inflated",
NULL, innodb_io_capacity_max_update,
SRV_MAX_IO_CAPACITY_DUMMY_DEFAULT, 100,
SRV_MAX_IO_CAPACITY_LIMIT, 0);
@@ -18804,14 +18804,14 @@ static MYSQL_SYSVAR_UINT(merge_threshold_set_all_debug,
innodb_merge_threshold_set_all_debug,
PLUGIN_VAR_RQCMDARG,
"Override current MERGE_THRESHOLD setting for all indexes at dictionary"
" cache by the specified value dynamically, at the time.",
" cache by the specified value dynamically, at the time",
NULL, innodb_merge_threshold_set_all_debug_update,
DICT_INDEX_MERGE_THRESHOLD_DEFAULT, 1, 50, 0);
#endif /* UNIV_DEBUG */
static MYSQL_SYSVAR_ULONG(purge_batch_size, srv_purge_batch_size,
PLUGIN_VAR_OPCMDARG,
"Number of UNDO log pages to purge in one batch from the history list.",
"Number of UNDO log pages to purge in one batch from the history list",
NULL, NULL,
1000, /* Default setting */
1, /* Minimum value */
@@ -18838,24 +18838,24 @@ static MYSQL_SYSVAR_UINT(purge_threads, srv_n_purge_threads,
static MYSQL_SYSVAR_UINT(fast_shutdown, srv_fast_shutdown,
PLUGIN_VAR_OPCMDARG,
"Speeds up the shutdown process of the InnoDB storage engine. Possible"
" values are 0, 1 (faster), 2 (crash-like), 3 (fastest clean).",
" values are 0, 1 (faster), 2 (crash-like), 3 (fastest clean)",
fast_shutdown_validate, NULL, 1, 0, 3, 0);
static MYSQL_SYSVAR_BOOL(file_per_table, srv_file_per_table,
PLUGIN_VAR_NOCMDARG | PLUGIN_VAR_DEPRECATED,
"Stores each InnoDB table to an .ibd file in the database dir.",
"Stores each InnoDB table to an .ibd file in the database dir",
NULL, NULL, TRUE);
static MYSQL_SYSVAR_STR(ft_server_stopword_table, innobase_server_stopword_table,
PLUGIN_VAR_OPCMDARG | PLUGIN_VAR_MEMALLOC,
"The user supplied stopword table name.",
"The user supplied stopword table name",
innodb_stopword_table_validate,
NULL,
NULL);
static MYSQL_SYSVAR_UINT(flush_log_at_timeout, srv_flush_log_at_timeout,
PLUGIN_VAR_OPCMDARG,
"Write and flush logs every (n) second.",
"Write and flush logs every (n) second",
NULL, NULL, 1, 0, 2700, 0);
static MYSQL_SYSVAR_ULONG(flush_log_at_trx_commit, srv_flush_log_at_trx_commit,
@@ -18869,12 +18869,12 @@ static MYSQL_SYSVAR_ULONG(flush_log_at_trx_commit, srv_flush_log_at_trx_commit,
" not be lost and will be consistent with the binlog and other transactional"
" engines. 2 can get inconsistent and lose transactions if there is a"
" power failure or kernel crash but not if mysqld crashes. 0 has no"
" guarantees in case of crash. 0 and 2 can be faster than 1 or 3.",
" guarantees in case of crash. 0 and 2 can be faster than 1 or 3",
NULL, NULL, 1, 0, 3, 0);
static MYSQL_SYSVAR_ENUM(flush_method, innodb_flush_method,
PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY | PLUGIN_VAR_DEPRECATED,
"With which method to flush data.",
"With which method to flush data",
NULL, NULL, innodb_flush_method_default, &innodb_flush_method_typelib);
static MYSQL_SYSVAR_STR(log_group_home_dir, srv_log_group_home_dir,
@@ -18883,36 +18883,36 @@ static MYSQL_SYSVAR_STR(log_group_home_dir, srv_log_group_home_dir,
static MYSQL_SYSVAR_DOUBLE(max_dirty_pages_pct, srv_max_buf_pool_modified_pct,
PLUGIN_VAR_RQCMDARG,
"Percentage of dirty pages allowed in bufferpool.",
"Percentage of dirty pages allowed in bufferpool",
NULL, innodb_max_dirty_pages_pct_update, 90.0, 0, 99.999, 0);
static MYSQL_SYSVAR_DOUBLE(max_dirty_pages_pct_lwm,
srv_max_dirty_pages_pct_lwm,
PLUGIN_VAR_RQCMDARG,
"Percentage of dirty pages at which flushing kicks in. "
"The value 0 (default) means 'refer to innodb_max_dirty_pages_pct'.",
"The value 0 (default) means 'refer to innodb_max_dirty_pages_pct'",
NULL, innodb_max_dirty_pages_pct_lwm_update, 0, 0, 99.999, 0);
static MYSQL_SYSVAR_DOUBLE(adaptive_flushing_lwm,
srv_adaptive_flushing_lwm,
PLUGIN_VAR_RQCMDARG,
"Percentage of log capacity below which no adaptive flushing happens.",
"Percentage of log capacity below which no adaptive flushing happens",
NULL, NULL, 10.0, 0.0, 70.0, 0);
static MYSQL_SYSVAR_BOOL(adaptive_flushing, srv_adaptive_flushing,
PLUGIN_VAR_NOCMDARG,
"Attempt flushing dirty pages to avoid IO bursts at checkpoints.",
"Attempt flushing dirty pages to avoid IO bursts at checkpoints",
NULL, NULL, TRUE);
static MYSQL_SYSVAR_BOOL(flush_sync, srv_flush_sync,
PLUGIN_VAR_NOCMDARG,
"Allow IO bursts at the checkpoints ignoring io_capacity setting.",
"Allow IO bursts at the checkpoints ignoring io_capacity setting",
NULL, NULL, TRUE);
static MYSQL_SYSVAR_ULONG(flushing_avg_loops,
srv_flushing_avg_loops,
PLUGIN_VAR_RQCMDARG,
"Number of iterations over which the background flushing is averaged.",
"Number of iterations over which the background flushing is averaged",
NULL, NULL, 30, 1, 1000, 0);
static MYSQL_SYSVAR_ULONG(max_purge_lag, srv_max_purge_lag,
@@ -18990,7 +18990,7 @@ static MYSQL_SYSVAR_BOOL(stats_traditional, srv_stats_sample_traditional,
#ifdef BTR_CUR_HASH_ADAPT
static MYSQL_SYSVAR_BOOL(adaptive_hash_index, btr_search_enabled,
PLUGIN_VAR_OPCMDARG,
"Enable InnoDB adaptive hash index (disabled by default).",
"Enable InnoDB adaptive hash index (disabled by default)",
NULL, innodb_adaptive_hash_index_update, false);
/** Number of distinct partitions of AHI.
@@ -19005,7 +19005,7 @@ static MYSQL_SYSVAR_ULONG(adaptive_hash_index_parts, btr_ahi_parts,
static MYSQL_SYSVAR_UINT(compression_level, page_zip_level,
PLUGIN_VAR_RQCMDARG,
"Compression level used for zlib compression. 0 is no compression"
", 1 is fastest, 9 is best compression and default is 6.",
", 1 is fastest, 9 is best compression and default is 6",
NULL, NULL, DEFAULT_COMPRESSION_LEVEL, 0, 9, 0);
static MYSQL_SYSVAR_UINT(autoextend_increment,
@@ -19018,7 +19018,7 @@ static MYSQL_SYSVAR_SIZE_T(buffer_pool_chunk_size, srv_buf_pool_chunk_unit,
PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
"Size of a single memory chunk"
" for resizing buffer pool. Online buffer pool resizing happens at this"
" granularity. 0 means autosize this variable based on buffer pool size.",
" granularity. 0 means autosize this variable based on buffer pool size",
NULL, NULL,
0, 0, SIZE_T_MAX, 1024 * 1024);
@@ -19093,12 +19093,12 @@ static MYSQL_SYSVAR_BOOL(deadlock_detect, innodb_deadlock_detect,
PLUGIN_VAR_NOCMDARG,
"Enable/disable InnoDB deadlock detector (default ON)."
" if set to OFF, deadlock detection is skipped,"
" and we rely on innodb_lock_wait_timeout in case of deadlock.",
" and we rely on innodb_lock_wait_timeout in case of deadlock",
NULL, NULL, TRUE);
static MYSQL_SYSVAR_ENUM(deadlock_report, innodb_deadlock_report,
PLUGIN_VAR_RQCMDARG,
"How to report deadlocks (if innodb_deadlock_detect=ON).",
"How to report deadlocks (if innodb_deadlock_detect=ON)",
NULL, NULL, Deadlock::REPORT_FULL, &innodb_deadlock_report_typelib);
static MYSQL_SYSVAR_UINT(fill_factor, innobase_fill_factor,
@@ -19108,7 +19108,7 @@ static MYSQL_SYSVAR_UINT(fill_factor, innobase_fill_factor,
static MYSQL_SYSVAR_BOOL(ft_enable_diag_print, fts_enable_diag_print,
PLUGIN_VAR_OPCMDARG,
"Whether to enable additional FTS diagnostic printout ",
"Whether to enable additional FTS diagnostic printout",
NULL, NULL, FALSE);
static MYSQL_SYSVAR_BOOL(disable_sort_file_cache, srv_disable_sort_file_cache,
@@ -19168,7 +19168,7 @@ static MYSQL_SYSVAR_ULONG(ft_max_token_size, fts_max_token_size,
static MYSQL_SYSVAR_ULONG(ft_num_word_optimize, fts_num_word_optimize,
PLUGIN_VAR_OPCMDARG,
"InnoDB Fulltext search number of words to optimize for each optimize table call ",
"InnoDB Fulltext search number of words to optimize for each optimize table call",
NULL, NULL, 2000, 1000, 10000, 0);
static MYSQL_SYSVAR_ULONG(ft_sort_pll_degree, fts_sort_pll_degree,
@@ -19222,28 +19222,28 @@ static void innodb_write_io_threads_update(THD* thd, struct st_mysql_sys_var*, v
static MYSQL_SYSVAR_UINT(read_io_threads, srv_n_read_io_threads,
PLUGIN_VAR_RQCMDARG,
"Number of background read I/O threads in InnoDB.",
"Number of background read I/O threads in InnoDB",
NULL, innodb_read_io_threads_update , 4, 1, 64, 0);
static MYSQL_SYSVAR_UINT(write_io_threads, srv_n_write_io_threads,
PLUGIN_VAR_RQCMDARG,
"Number of background write I/O threads in InnoDB.",
"Number of background write I/O threads in InnoDB",
NULL, innodb_write_io_threads_update, 4, 2, 64, 0);
static MYSQL_SYSVAR_ULONG(force_recovery, srv_force_recovery,
PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
"Helps to save your data in case the disk image of the database becomes corrupt. Value 5 can return bogus data, and 6 can permanently corrupt data.",
"Helps to save your data in case the disk image of the database becomes corrupt. Value 5 can return bogus data, and 6 can permanently corrupt data",
NULL, NULL, 0, 0, 6, 0);
static MYSQL_SYSVAR_ULONG(page_size, srv_page_size,
PLUGIN_VAR_OPCMDARG | PLUGIN_VAR_READONLY,
"Page size to use for all InnoDB tablespaces.",
"Page size to use for all InnoDB tablespaces",
NULL, NULL, UNIV_PAGE_SIZE_DEF,
UNIV_PAGE_SIZE_MIN, UNIV_PAGE_SIZE_MAX, 0);
static MYSQL_SYSVAR_UINT(log_buffer_size, log_sys.buf_size,
PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
"Redo log buffer size in bytes.",
"Redo log buffer size in bytes",
NULL, NULL, 16U << 20, 2U << 20, log_sys.buf_size_max, 4096);
#if defined __linux__ || defined _WIN32
@@ -19270,7 +19270,7 @@ static MYSQL_SYSVAR_BOOL(data_file_write_through, fil_system.write_through,
static MYSQL_SYSVAR_ULONGLONG(log_file_size, srv_log_file_size,
PLUGIN_VAR_RQCMDARG,
"Redo log size in bytes.",
"Redo log size in bytes",
nullptr, innodb_log_file_size_update,
96 << 20, 4 << 20, std::numeric_limits<ulonglong>::max(), 4096);
@@ -19282,19 +19282,19 @@ static MYSQL_SYSVAR_UINT(log_spin_wait_delay, mtr_t::spin_wait_delay,
static MYSQL_SYSVAR_UINT(old_blocks_pct, innobase_old_blocks_pct,
PLUGIN_VAR_RQCMDARG,
"Percentage of the buffer pool to reserve for 'old' blocks.",
"Percentage of the buffer pool to reserve for 'old' blocks",
NULL, innodb_old_blocks_pct_update, 100 * 3 / 8, 5, 95, 0);
static MYSQL_SYSVAR_UINT(old_blocks_time, buf_LRU_old_threshold_ms,
PLUGIN_VAR_RQCMDARG,
"Move blocks to the 'new' end of the buffer pool if the first access"
" was at least this many milliseconds ago."
" The timeout is disabled if 0.",
" The timeout is disabled if 0",
NULL, NULL, 1000, 0, UINT_MAX32, 0);
static MYSQL_SYSVAR_ULONG(open_files, innobase_open_files,
PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
"How many files at the maximum InnoDB keeps open at the same time.",
"How many files at the maximum InnoDB keeps open at the same time",
NULL, NULL, 0, 0, LONG_MAX, 0);
static MYSQL_SYSVAR_ULONG(sync_spin_loops, srv_n_spin_wait_rounds,
@@ -19317,22 +19317,22 @@ static MYSQL_SYSVAR_BOOL(prefix_index_cluster_optimization,
static MYSQL_SYSVAR_STR(data_file_path, innobase_data_file_path,
PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
"Path to individual files and their sizes.",
"Path to individual files and their sizes",
NULL, NULL, "ibdata1:12M:autoextend");
static MYSQL_SYSVAR_STR(temp_data_file_path, innobase_temp_data_file_path,
PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
"Path to files and their sizes making temp-tablespace.",
"Path to files and their sizes making temp-tablespace",
NULL, NULL, "ibtmp1:12M:autoextend");
static MYSQL_SYSVAR_STR(undo_directory, srv_undo_dir,
PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
"Directory where undo tablespace files live, this path can be absolute.",
"Directory where undo tablespace files live, this path can be absolute",
NULL, NULL, NULL);
static MYSQL_SYSVAR_UINT(undo_tablespaces, srv_undo_tablespaces,
PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
"Number of undo tablespaces to use.",
"Number of undo tablespaces to use",
NULL, NULL,
3L, /* Default seting */
0L, /* Minimum value */
@@ -19362,7 +19362,7 @@ static void innodb_undo_log_truncate_update(THD *thd, struct st_mysql_sys_var*,
static MYSQL_SYSVAR_BOOL(undo_log_truncate, srv_undo_log_truncate,
PLUGIN_VAR_OPCMDARG,
"Enable or Disable Truncate of UNDO tablespace.",
"Enable or Disable Truncate of UNDO tablespace",
NULL, innodb_undo_log_truncate_update, FALSE);
static MYSQL_SYSVAR_LONG(autoinc_lock_mode, innobase_autoinc_lock_mode,
@@ -19405,13 +19405,13 @@ bool innodb_use_native_aio_default()
static MYSQL_SYSVAR_BOOL(use_native_aio, srv_use_native_aio,
PLUGIN_VAR_NOCMDARG | PLUGIN_VAR_READONLY,
"Use native AIO if supported on this platform.",
"Use native AIO if supported on this platform",
NULL, NULL, innodb_use_native_aio_default());
#ifdef HAVE_LIBNUMA
static MYSQL_SYSVAR_BOOL(numa_interleave, srv_numa_interleave,
PLUGIN_VAR_NOCMDARG | PLUGIN_VAR_READONLY,
"Use NUMA interleave memory policy to allocate InnoDB buffer pool.",
"Use NUMA interleave memory policy to allocate InnoDB buffer pool",
NULL, NULL, FALSE);
#endif /* HAVE_LIBNUMA */
@@ -19427,18 +19427,18 @@ static MYSQL_SYSVAR_ULONG(buf_dump_status_frequency, srv_buf_dump_status_frequen
"A number between [0, 100] that tells how oftern buffer pool dump status "
"in percentages should be printed. E.g. 10 means that buffer pool dump "
"status is printed when every 10% of number of buffer pool pages are "
"dumped. Default is 0 (only start and end status is printed).",
"dumped. Default is 0 (only start and end status is printed)",
NULL, NULL, 0, 0, 100, 0);
static MYSQL_SYSVAR_BOOL(random_read_ahead, srv_random_read_ahead,
PLUGIN_VAR_NOCMDARG,
"Whether to use read ahead for random access within an extent.",
"Whether to use read ahead for random access within an extent",
NULL, NULL, FALSE);
static MYSQL_SYSVAR_ULONG(read_ahead_threshold, srv_read_ahead_threshold,
PLUGIN_VAR_RQCMDARG,
"Number of pages that must be accessed sequentially for InnoDB to"
" trigger a readahead.",
" trigger a readahead",
NULL, NULL, 56, 0, 64, 0);
static MYSQL_SYSVAR_STR(monitor_enable, innobase_enable_monitor_counter,
@@ -19466,12 +19466,12 @@ static MYSQL_SYSVAR_STR(monitor_reset_all, innobase_reset_all_monitor_counter,
innodb_reset_all_monitor_update, NULL);
static MYSQL_SYSVAR_BOOL(status_output, srv_print_innodb_monitor,
PLUGIN_VAR_OPCMDARG, "Enable InnoDB monitor output to the error log.",
PLUGIN_VAR_OPCMDARG, "Enable InnoDB monitor output to the error log",
NULL, innodb_status_output_update, FALSE);
static MYSQL_SYSVAR_BOOL(status_output_locks, srv_print_innodb_lock_monitor,
PLUGIN_VAR_OPCMDARG, "Enable InnoDB lock monitor output to the error log."
" Requires innodb_status_output=ON.",
" Requires innodb_status_output=ON",
NULL, innodb_status_output_update, FALSE);
static MYSQL_SYSVAR_BOOL(print_all_deadlocks, srv_print_all_deadlocks,
@@ -19489,7 +19489,7 @@ static MYSQL_SYSVAR_ULONG(compression_failure_threshold_pct,
static MYSQL_SYSVAR_ULONG(compression_pad_pct_max,
zip_pad_max, PLUGIN_VAR_OPCMDARG,
"Percentage of empty space on a data page that can be reserved"
" to make the page compressible.",
" to make the page compressible",
NULL, NULL, 50, 0, 75, 0);
static MYSQL_SYSVAR_BOOL(read_only, srv_read_only_mode,
@@ -19524,35 +19524,35 @@ static MYSQL_SYSVAR_UINT(trx_rseg_n_slots_debug, trx_rseg_n_slots_debug,
static MYSQL_SYSVAR_UINT(limit_optimistic_insert_debug,
btr_cur_limit_optimistic_insert_debug, PLUGIN_VAR_RQCMDARG,
"Artificially limit the number of records per B-tree page (0=unlimited).",
"Artificially limit the number of records per B-tree page (0=unlimited)",
NULL, NULL, 0, 0, UINT_MAX32, 0);
static MYSQL_SYSVAR_BOOL(trx_purge_view_update_only_debug,
srv_purge_view_update_only_debug, PLUGIN_VAR_NOCMDOPT,
"Pause actual purging any delete-marked records, but merely update the purge view."
" It is to create artificially the situation the purge view have been updated"
" but the each purges were not done yet.",
" but the each purges were not done yet",
NULL, NULL, FALSE);
static MYSQL_SYSVAR_BOOL(evict_tables_on_commit_debug,
innodb_evict_tables_on_commit_debug, PLUGIN_VAR_OPCMDARG,
"On transaction commit, try to evict tables from the data dictionary cache.",
"On transaction commit, try to evict tables from the data dictionary cache",
NULL, NULL, FALSE);
static MYSQL_SYSVAR_UINT(data_file_size_debug,
srv_sys_space_size_debug,
PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
"InnoDB system tablespace size to be set in recovery.",
"InnoDB system tablespace size to be set in recovery",
NULL, NULL, 0, 0, 256U << 20, 0);
static MYSQL_SYSVAR_UINT(fil_make_page_dirty_debug,
srv_fil_make_page_dirty_debug, PLUGIN_VAR_OPCMDARG,
"Make the first page of the given tablespace dirty.",
"Make the first page of the given tablespace dirty",
NULL, innodb_make_page_dirty, 0, 0, UINT_MAX32, 0);
static MYSQL_SYSVAR_UINT(saved_page_number_debug,
srv_saved_page_number_debug, PLUGIN_VAR_OPCMDARG,
"An InnoDB page number.",
"An InnoDB page number",
NULL, NULL, 0, 0, UINT_MAX32, 0);
#endif /* UNIV_DEBUG */
@@ -19580,7 +19580,7 @@ static MYSQL_SYSVAR_ENUM(compression_algorithm, innodb_compression_algorithm,
static MYSQL_SYSVAR_ULONG(fatal_semaphore_wait_threshold, srv_fatal_semaphore_wait_threshold,
PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
"Maximum number of seconds that semaphore times out in InnoDB.",
"Maximum number of seconds that semaphore times out in InnoDB",
NULL, NULL,
DEFAULT_SRV_FATAL_SEMAPHORE_TIMEOUT, /* Default setting */
1, /* Minimum setting */
@@ -19603,7 +19603,7 @@ static MYSQL_SYSVAR_ENUM(encrypt_tables, srv_encrypt_tables,
static MYSQL_SYSVAR_UINT(encryption_threads, srv_n_fil_crypt_threads,
PLUGIN_VAR_RQCMDARG,
"Number of threads performing background key rotation ",
"Number of threads performing background key rotation",
NULL,
innodb_encryption_threads_update,
0, 0, 255, 0);
@@ -19614,7 +19614,7 @@ static MYSQL_SYSVAR_UINT(encryption_rotate_key_age,
"Key rotation - re-encrypt in background "
"all pages that were encrypted with a key that "
"many (or more) versions behind. Value 0 indicates "
"that key rotation is disabled.",
"that key rotation is disabled",
NULL,
innodb_encryption_rotate_key_age_update,
1, 0, UINT_MAX32, 0);
@@ -19639,7 +19639,7 @@ static MYSQL_SYSVAR_BOOL(immediate_scrub_data_uncompressed,
static MYSQL_SYSVAR_BOOL(encrypt_temporary_tables, innodb_encrypt_temporary_tables,
PLUGIN_VAR_OPCMDARG | PLUGIN_VAR_READONLY,
"Enrypt the temporary table data.",
"Enrypt the temporary table data",
NULL, NULL, false);
static MYSQL_SYSVAR_BOOL(truncate_temporary_tablespace_now,

3
storage/maria/aria_dump_log.c
View File

@@ -55,8 +55,7 @@ static struct my_option my_long_options[] =
{ "pages", 'n', "Number of pages to read",
(uchar**) &opt_pages, (uchar**) &opt_pages, 0,
GET_ULONG, REQUIRED_ARG, (long) ~(ulong) 0,
(long) 1, (long) ~(ulong) 0, (long) 0,
(long) 1, 0},
(long) 1, (long) ~(ulong) 0, 0, (long) 1, 0},
{"unit-test", 'U',
"Use unit test record table (for logs created by unittests",
(uchar **) &opt_unit, (uchar **) &opt_unit, 0,

20
storage/maria/ha_maria.cc
View File

@@ -157,20 +157,20 @@ static void update_log_file_size(MYSQL_THD thd,
/* The 4096 is there because of MariaDB privilege tables */
static MYSQL_SYSVAR_ULONG(block_size, maria_block_size,
PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
"Block size to be used for Aria index pages.", 0, 0,
"Block size to be used for Aria index pages", 0, 0,
MARIA_KEY_BLOCK_LENGTH, 4096,
MARIA_MAX_KEY_BLOCK_LENGTH, MARIA_MIN_KEY_BLOCK_LENGTH);
static MYSQL_SYSVAR_ULONG(checkpoint_interval, checkpoint_interval,
PLUGIN_VAR_RQCMDARG,
"Interval between tries to do an automatic checkpoints. In seconds; 0 means"
" 'no automatic checkpoints' which makes sense only for testing.",
" 'no automatic checkpoints' which makes sense only for testing",
NULL, update_checkpoint_interval, 30, 0, UINT_MAX, 1);
static MYSQL_SYSVAR_ULONG(checkpoint_log_activity, maria_checkpoint_min_log_activity,
PLUGIN_VAR_RQCMDARG,
"Number of bytes that the transaction log has to grow between checkpoints before a new "
"checkpoint is written to the log.",
"checkpoint is written to the log",
NULL, NULL, 1024*1024, 0, UINT_MAX, 1);
static MYSQL_SYSVAR_ULONG(force_start_after_recovery_failures,
@@ -182,7 +182,7 @@ static MYSQL_SYSVAR_ULONG(force_start_after_recovery_failures,
PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
"Number of consecutive log recovery failures after which logs will be"
" automatically deleted to cure the problem; 0 (the default) disables"
" the feature.", NULL, NULL, 0, 0, UINT_MAX8, 1);
" the feature", NULL, NULL, 0, 0, UINT_MAX8, 1);
static MYSQL_SYSVAR_BOOL(page_checksum, maria_page_checksums, 0,
"Maintain page checksums (can be overridden per table "
@@ -227,7 +227,7 @@ static MYSQL_SYSVAR_ENUM(log_purge_type, log_purge_type,
static MYSQL_SYSVAR_ULONGLONG(max_sort_file_size,
maria_max_temp_length, PLUGIN_VAR_RQCMDARG,
"Don't use the fast sort index method to created index if the "
"temporary file would get bigger than this.",
"temporary file would get bigger than this",
0, 0, MAX_FILE_SIZE & ~((ulonglong) (1*MB-1)),
0, MAX_FILE_SIZE, 1*MB);
@@ -236,14 +236,14 @@ static MYSQL_SYSVAR_ULONG(pagecache_age_threshold,
"This characterizes the number of hits a hot block has to be untouched "
"until it is considered aged enough to be downgraded to a warm block. "
"This specifies the percentage ratio of that number of hits to the "
"total number of blocks in the page cache.", 0, 0,
"total number of blocks in the page cache", 0, 0,
300, 100, ~ (ulong) 0L, 100);
static MYSQL_SYSVAR_ULONGLONG(pagecache_buffer_size, pagecache_buffer_size,
PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
"The size of the buffer used for index blocks for Aria tables. "
"Increase this to get better index handling (for all reads and "
"multiple writes) to as much as you can afford.", 0, 0,
"multiple writes) to as much as you can afford", 0, 0,
KEY_CACHE_SIZE, 8192*16L, ~(ulonglong) 0, 1);
static MYSQL_SYSVAR_ULONG(pagecache_division_limit, pagecache_division_limit,
@@ -255,7 +255,7 @@ static MYSQL_SYSVAR_ULONG(pagecache_file_hash_size, pagecache_file_hash_size,
PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
"Number of hash buckets for open and changed files. If you have a lot of Aria "
"files open you should increase this for faster flush of changes. A good "
"value is probably 1/10 of number of possible open Aria files.", 0,0,
"value is probably 1/10 of number of possible open Aria files", 0,0,
512, 128, 16384, 1);
static MYSQL_SYSVAR_SET(recover_options, maria_recover_options, PLUGIN_VAR_OPCMDARG,
@@ -264,12 +264,12 @@ static MYSQL_SYSVAR_SET(recover_options, maria_recover_options, PLUGIN_VAR_OPCMD
static MYSQL_THDVAR_ULONG(repair_threads, PLUGIN_VAR_RQCMDARG,
"Number of threads to use when repairing Aria tables. The value of 1 "
"disables parallel repair.",
"disables parallel repair",
0, 0, 1, 1, 128, 1);
static MYSQL_THDVAR_ULONGLONG(sort_buffer_size, PLUGIN_VAR_RQCMDARG,
"The buffer that is allocated when sorting the index when doing a "
"REPAIR or when creating indexes with CREATE INDEX or ALTER TABLE.",
"REPAIR or when creating indexes with CREATE INDEX or ALTER TABLE",
NULL, NULL,
SORT_BUFFER_INIT, MARIA_MIN_SORT_MEMORY, SIZE_T_MAX/16, 1);

8
storage/maria/ha_s3.cc
View File

@@ -173,7 +173,7 @@ static MYSQL_SYSVAR_ENUM(protocol_version, s3_protocol_version,
"\"Auto\", \"Legacy\", \"Original\", \"Amazon\", "
"\"Path\" or \"Domain\". "
"Note: \"Legacy\", \"Original\" and \"Amazon\" are "
"deprecated.",
"deprecated",
NULL, NULL, 0, &s3_protocol_typelib);
static MYSQL_SYSVAR_ULONG(pagecache_age_threshold,
@@ -181,14 +181,14 @@ static MYSQL_SYSVAR_ULONG(pagecache_age_threshold,
"This characterizes the number of hits a hot block has to be untouched "
"until it is considered aged enough to be downgraded to a warm block. "
"This specifies the percentage ratio of that number of hits to the "
"total number of blocks in the page cache.", 0, 0,
"total number of blocks in the page cache", 0, 0,
300, 100, ~ (ulong) 0L, 100);
static MYSQL_SYSVAR_ULONGLONG(pagecache_buffer_size, s3_pagecache_buffer_size,
PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
"The size of the buffer used for index blocks for S3 tables. "
"Increase this to get better index handling (for all reads and "
"multiple writes) to as much as you can afford.", 0, 0,
"multiple writes) to as much as you can afford", 0, 0,
128*1024*1024, 1024*1024*32, ~(ulonglong) 0, 8192);
static MYSQL_SYSVAR_ULONG(pagecache_division_limit,
@@ -203,7 +203,7 @@ static MYSQL_SYSVAR_ULONG(pagecache_file_hash_size,
"Number of hash buckets for open files. If you have a lot "
"of S3 files open you should increase this for faster flush of "
"changes. A good value is probably 1/10 of number of possible open "
"S3 files.", 0,0, 512, 32, 16384, 1);
"S3 files", 0,0, 512, 32, 16384, 1);
static MYSQL_SYSVAR_STR(bucket, s3_bucket,
PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,

4
storage/mroonga/ha_mroonga.cpp
View File

@@ -980,7 +980,7 @@ static MYSQL_SYSVAR_STR(default_tokenizer, mrn_default_tokenizer,
static MYSQL_THDVAR_BOOL(
dry_write, /* name */
PLUGIN_VAR_OPCMDARG, /* options */
"If dry_write is true, any write operations are ignored.", /* comment */
"If dry_write is true, any write operations are ignored", /* comment */
NULL, /* check */
NULL, /* update */
false /* default */
@@ -989,7 +989,7 @@ static MYSQL_THDVAR_BOOL(
static MYSQL_THDVAR_BOOL(
enable_optimization, /* name */
PLUGIN_VAR_OPCMDARG, /* options */
"If enable_optimization is true, some optimizations will be applied.", /* comment */
"If enable_optimization is true, some optimizations will be applied", /* comment */
NULL, /* check */
NULL, /* update */
true /* default */

79
storage/rocksdb/ha_rocksdb.cc
View File

@@ -953,19 +953,19 @@ static MYSQL_THDVAR_BOOL(
static MYSQL_THDVAR_BOOL(
bulk_load, PLUGIN_VAR_RQCMDARG,
"Use bulk-load mode for inserts. This disables "
"unique_checks and enables rocksdb_commit_in_the_middle.",
"unique_checks and enables rocksdb_commit_in_the_middle",
rocksdb_check_bulk_load, nullptr, FALSE);
static MYSQL_THDVAR_BOOL(bulk_load_allow_sk, PLUGIN_VAR_RQCMDARG,
"Allow bulk loading of sk keys during bulk-load. "
"Can be changed only when bulk load is disabled.",
"Can be changed only when bulk load is disabled",
/* Intentionally reuse unsorted's check function */
rocksdb_check_bulk_load_allow_unsorted, nullptr,
FALSE);
static MYSQL_THDVAR_BOOL(bulk_load_allow_unsorted, PLUGIN_VAR_RQCMDARG,
"Allow unsorted input during bulk-load. "
"Can be changed only when bulk load is disabled.",
"Can be changed only when bulk load is disabled",
rocksdb_check_bulk_load_allow_unsorted, nullptr,
FALSE);
@@ -980,7 +980,7 @@ static MYSQL_SYSVAR_STR(git_hash, rocksdb_git_hash,
nullptr, nullptr, ROCKSDB_GIT_HASH);
static MYSQL_THDVAR_STR(tmpdir, PLUGIN_VAR_OPCMDARG | PLUGIN_VAR_MEMALLOC,
"Directory for temporary files during DDL operations.",
"Directory for temporary files during DDL operations",
nullptr, nullptr, "");
#define DEFAULT_SKIP_UNIQUE_CHECK_TABLES ".*"
@@ -1075,7 +1075,7 @@ static MYSQL_SYSVAR_ENUM(
"Use read-free replication on the slave (i.e. no row lookup during "
"replication). Default is OFF, PK_SK will enable it on all tables with "
"primary key. PK_ONLY will enable it on tables where the only key is the "
"primary key (i.e. no secondary keys).",
"primary key (i.e. no secondary keys)",
nullptr, nullptr, read_free_rpl_type::OFF, &read_free_rpl_typelib);
#endif
@@ -1092,7 +1092,7 @@ static MYSQL_THDVAR_ULONG(max_row_locks, PLUGIN_VAR_RQCMDARG,
static MYSQL_THDVAR_ULONGLONG(
write_batch_max_bytes, PLUGIN_VAR_RQCMDARG,
"Maximum size of write batch in bytes. 0 means no limit.", nullptr, nullptr,
"Maximum size of write batch in bytes. 0 means no limit", nullptr, nullptr,
/* default */ 0, /* min */ 0, /* max */ SIZE_T_MAX, 1);
static MYSQL_THDVAR_BOOL(
@@ -1110,7 +1110,7 @@ static MYSQL_THDVAR_ULONG(bulk_load_size, PLUGIN_VAR_RQCMDARG,
static MYSQL_THDVAR_ULONGLONG(
merge_buf_size, PLUGIN_VAR_RQCMDARG,
"Size to allocate for merge sort buffers written out to disk "
"during inplace index creation.",
"during inplace index creation",
nullptr, nullptr,
/* default (64MB) */ RDB_DEFAULT_MERGE_BUF_SIZE,
/* min (100B) */ RDB_MIN_MERGE_BUF_SIZE,
@@ -1120,7 +1120,7 @@ static MYSQL_THDVAR_ULONGLONG(
merge_combine_read_size, PLUGIN_VAR_RQCMDARG,
"Size that we have to work with during combine (reading from disk) phase "
"of "
"external sort during fast index creation.",
"external sort during fast index creation",
nullptr, nullptr,
/* default (1GB) */ RDB_DEFAULT_MERGE_COMBINE_READ_SIZE,
/* min (100B) */ RDB_MIN_MERGE_COMBINE_READ_SIZE,
@@ -1132,7 +1132,7 @@ static MYSQL_THDVAR_ULONGLONG(
"creation. Removing this large file all at once when index creation is "
"complete can cause trim stalls on Flash. This variable specifies a "
"duration to sleep (in milliseconds) between calling chsize() to truncate "
"the file in chunks. The chunk size is the same as merge_buf_size.",
"the file in chunks. The chunk size is the same as merge_buf_size",
nullptr, nullptr,
/* default (0ms) */ RDB_DEFAULT_MERGE_TMP_FILE_REMOVAL_DELAY,
/* min (0ms) */ RDB_MIN_MERGE_TMP_FILE_REMOVAL_DELAY,
@@ -1225,7 +1225,7 @@ static MYSQL_SYSVAR_ENUM(
info_log_level, rocksdb_info_log_level, PLUGIN_VAR_RQCMDARG,
"Filter level for info logs to be written mysqld error log. "
"Valid values include 'debug_level', 'info_level', 'warn_level'"
"'error_level' and 'fatal_level'.",
"'error_level' and 'fatal_level'",
nullptr, rocksdb_set_rocksdb_info_log_level,
rocksdb::InfoLogLevel::ERROR_LEVEL, &info_log_level_typelib);
@@ -1532,7 +1532,7 @@ static MYSQL_SYSVAR_BOOL(
static MYSQL_SYSVAR_BOOL(cache_dump, rocksdb_cache_dump,
PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
"Include RocksDB block cache content in core dump.",
"Include RocksDB block cache content in core dump",
nullptr, nullptr, true);
static MYSQL_SYSVAR_DOUBLE(cache_high_pri_pool_ratio,
@@ -1675,7 +1675,7 @@ static MYSQL_THDVAR_UINT(records_in_range, PLUGIN_VAR_RQCMDARG,
static MYSQL_THDVAR_UINT(force_index_records_in_range, PLUGIN_VAR_RQCMDARG,
"Used to override the result of records_in_range() "
"when FORCE INDEX is used.",
"when FORCE INDEX is used",
nullptr, nullptr, 0,
/* min */ 0, /* max */ INT_MAX, 0);
@@ -1735,7 +1735,7 @@ static MYSQL_SYSVAR_BOOL(pause_background_work, rocksdb_pause_background_work,
static MYSQL_SYSVAR_BOOL(
enable_ttl, rocksdb_enable_ttl, PLUGIN_VAR_RQCMDARG,
"Enable expired TTL records to be dropped during compaction.", nullptr,
"Enable expired TTL records to be dropped during compaction", nullptr,
nullptr, TRUE);
static MYSQL_SYSVAR_BOOL(
@@ -1744,7 +1744,7 @@ static MYSQL_SYSVAR_BOOL(
"For tables with TTL, expired records are skipped/filtered out during "
"processing and in query results. Disabling this will allow these records "
"to be seen, but as a result rows may disappear in the middle of "
"transactions as they are dropped during compaction. Use with caution.",
"transactions as they are dropped during compaction. Use with caution",
nullptr, nullptr, TRUE);
static MYSQL_SYSVAR_INT(
@@ -1753,7 +1753,7 @@ static MYSQL_SYSVAR_INT(
"now() + debug_ttl_rec_ts. The value can be +/- to simulate "
"a record inserted in the past vs a record inserted in the 'future'. "
"A value of 0 denotes that the variable is not set. This variable is a "
"no-op in non-debug builds.",
"no-op in non-debug builds",
nullptr, nullptr, 0, /* min */ -3600, /* max */ 3600, 0);
static MYSQL_SYSVAR_INT(
@@ -1762,7 +1762,7 @@ static MYSQL_SYSVAR_INT(
"now() + debug_set_ttl_snapshot_ts. The value can be +/- to simulate "
"a snapshot in the past vs a snapshot created in the 'future'. "
"A value of 0 denotes that the variable is not set. This variable is a "
"no-op in non-debug builds.",
"no-op in non-debug builds",
nullptr, nullptr, 0, /* min */ -3600, /* max */ 3600, 0);
static MYSQL_SYSVAR_INT(
@@ -1770,18 +1770,18 @@ static MYSQL_SYSVAR_INT(
PLUGIN_VAR_RQCMDARG,
"For debugging purposes only. Overrides the TTL read filtering time to "
"time + debug_ttl_read_filter_ts. A value of 0 denotes that the variable "
"is not set. This variable is a no-op in non-debug builds.",
"is not set. This variable is a no-op in non-debug builds",
nullptr, nullptr, 0, /* min */ -3600, /* max */ 3600, 0);
static MYSQL_SYSVAR_BOOL(
debug_ttl_ignore_pk, rocksdb_debug_ttl_ignore_pk, PLUGIN_VAR_RQCMDARG,
"For debugging purposes only. If true, compaction filtering will not occur "
"on PK TTL data. This variable is a no-op in non-debug builds.",
"on PK TTL data. This variable is a no-op in non-debug builds",
nullptr, nullptr, FALSE);
static MYSQL_SYSVAR_UINT(
max_manual_compactions, rocksdb_max_manual_compactions, PLUGIN_VAR_RQCMDARG,
"Maximum number of pending + ongoing number of manual compactions.",
"Maximum number of pending + ongoing number of manual compactions",
nullptr, nullptr, /* default */ 10, /* min */ 0, /* max */ UINT_MAX, 0);
static MYSQL_SYSVAR_BOOL(
@@ -1794,17 +1794,17 @@ static MYSQL_SYSVAR_UINT(
debug_manual_compaction_delay, rocksdb_debug_manual_compaction_delay,
PLUGIN_VAR_RQCMDARG,
"For debugging purposes only. Sleeping specified seconds "
"for simulating long running compactions.",
"for simulating long running compactions",
nullptr, nullptr, 0, /* min */ 0, /* max */ UINT_MAX, 0);
static MYSQL_SYSVAR_BOOL(
reset_stats, rocksdb_reset_stats, PLUGIN_VAR_RQCMDARG,
"Reset the RocksDB internal statistics without restarting the DB.", nullptr,
"Reset the RocksDB internal statistics without restarting the DB", nullptr,
rocksdb_set_reset_stats, FALSE);
static MYSQL_SYSVAR_UINT(io_write_timeout, rocksdb_io_write_timeout_secs,
PLUGIN_VAR_RQCMDARG,
"Timeout for experimental I/O watchdog.", nullptr,
"Timeout for experimental I/O watchdog", nullptr,
rocksdb_set_io_write_timeout, /* default */ 0,
/* min */ 0L,
/* max */ UINT_MAX, 0);
@@ -1845,7 +1845,7 @@ static MYSQL_SYSVAR_BOOL(
static MYSQL_SYSVAR_BOOL(
force_flush_memtable_and_lzero_now,
rocksdb_force_flush_memtable_and_lzero_now_var, PLUGIN_VAR_RQCMDARG,
"Acts similar to force_flush_memtable_now, but also compacts all L0 files.",
"Acts similar to force_flush_memtable_now, but also compacts all L0 files",
rocksdb_force_flush_memtable_and_lzero_now,
rocksdb_force_flush_memtable_and_lzero_now_stub, FALSE);
@@ -1853,7 +1853,7 @@ static MYSQL_SYSVAR_UINT(
seconds_between_stat_computes, rocksdb_seconds_between_stat_computes,
PLUGIN_VAR_RQCMDARG,
"Sets a number of seconds to wait between optimizer stats recomputation. "
"Only changed indexes will be refreshed.",
"Only changed indexes will be refreshed",
nullptr, nullptr, rocksdb_seconds_between_stat_computes,
/* min */ 0L, /* max */ UINT_MAX, 0);
@@ -1910,7 +1910,7 @@ static MYSQL_THDVAR_BOOL(verify_row_debug_checksums, PLUGIN_VAR_RQCMDARG,
static MYSQL_THDVAR_BOOL(master_skip_tx_api, PLUGIN_VAR_RQCMDARG,
"Skipping holding any lock on row access. "
"Not effective on slave.",
"Not effective on slave",
nullptr, nullptr, false);
static MYSQL_SYSVAR_UINT(
@@ -1946,24 +1946,11 @@ static MYSQL_SYSVAR_UINT(
table_stats_sampling_pct, rocksdb_table_stats_sampling_pct,
PLUGIN_VAR_RQCMDARG,
"Percentage of entries to sample when collecting statistics about table "
"properties. Specify either 0 to sample everything or percentage "
"[" STRINGIFY_ARG(RDB_TBL_STATS_SAMPLE_PCT_MIN) ".." STRINGIFY_ARG(
RDB_TBL_STATS_SAMPLE_PCT_MAX) "]. "
"By default " STRINGIFY_ARG(
RDB_DEFAULT_TBL_STATS_SAMPLE_PCT) "% "
"of"
" e"
"nt"
"ri"
"es"
" a"
"re"
" "
"sa"
"mp"
"le"
"d"
".",
"properties. Specify either 0 to sample everything or percentage ["
STRINGIFY_ARG(RDB_TBL_STATS_SAMPLE_PCT_MIN) ".."
STRINGIFY_ARG(RDB_TBL_STATS_SAMPLE_PCT_MAX)
"]. By default " STRINGIFY_ARG(RDB_DEFAULT_TBL_STATS_SAMPLE_PCT)
"% of entries are sampled",
nullptr, rocksdb_set_table_stats_sampling_pct, /* default */
RDB_DEFAULT_TBL_STATS_SAMPLE_PCT, /* everything */ 0,
/* max */ RDB_TBL_STATS_SAMPLE_PCT_MAX, 0);
@@ -1971,21 +1958,21 @@ static MYSQL_SYSVAR_UINT(
static MYSQL_SYSVAR_UINT(
stats_recalc_rate, rocksdb_stats_recalc_rate, PLUGIN_VAR_RQCMDARG,
"The number of indexes per second to recalculate statistics for. 0 to "
"disable background recalculation.",
"disable background recalculation",
nullptr, nullptr, 0 /* default value */, 0 /* min value */,
UINT_MAX /* max value */, 0);
static MYSQL_SYSVAR_BOOL(
large_prefix, rocksdb_large_prefix, PLUGIN_VAR_RQCMDARG,
"Support large index prefix length of 3072 bytes. If off, the maximum "
"index prefix length is 767.",
"index prefix length is 767",
nullptr, nullptr, FALSE);
static MYSQL_SYSVAR_BOOL(
allow_to_start_after_corruption, rocksdb_allow_to_start_after_corruption,
PLUGIN_VAR_OPCMDARG | PLUGIN_VAR_READONLY,
"Allow server still to start successfully even if RocksDB corruption is "
"detected.",
"detected",
nullptr, nullptr, FALSE);
static MYSQL_SYSVAR_BOOL(error_on_suboptimal_collation,

20
storage/spider/spd_param.cc
View File

@@ -515,7 +515,7 @@ SPIDER_THDVAR_OVERRIDE_VALUE_FUNC(longlong, split_read)
static MYSQL_THDVAR_INT(
semi_split_read, /* name */
PLUGIN_VAR_RQCMDARG, /* opt */
"Use offset and limit parameter in SQL for split_read parameter.", /* comment */
"Use offset and limit parameter in SQL for split_read parameter", /* comment */
NULL, /* check */
spider_var_deprecated_int, /* update */
2, /* def */
@@ -1318,7 +1318,7 @@ SPIDER_THDVAR_OVERRIDE_VALUE_FUNC(double, crd_interval)
static MYSQL_THDVAR_INT(
crd_mode, /* name */
PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_DEPRECATED, /* opt */
"Mode of cardinality confirmation.", /* comment */
"Mode of cardinality confirmation", /* comment */
NULL, /* check */
spider_var_deprecated_int, /* update */
1, /* def */
@@ -1339,7 +1339,7 @@ SPIDER_THDVAR_OVERRIDE_VALUE_FUNC(int, crd_mode)
static MYSQL_THDVAR_INT(
crd_sync, /* name */
PLUGIN_VAR_RQCMDARG, /* opt */
"Cardinality synchronization in partitioned table.", /* comment */
"Cardinality synchronization in partitioned table", /* comment */
NULL, /* check */
spider_var_deprecated_int, /* update */
0, /* def */
@@ -1359,7 +1359,7 @@ SPIDER_THDVAR_OVERRIDE_VALUE_FUNC(int, crd_sync)
static MYSQL_THDVAR_INT(
crd_type, /* name */
PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_DEPRECATED, /* opt */
"Type of cardinality calculation.", /* comment */
"Type of cardinality calculation", /* comment */
NULL, /* check */
spider_var_deprecated_int, /* update */
2, /* def */
@@ -1377,7 +1377,7 @@ SPIDER_THDVAR_OVERRIDE_VALUE_FUNC(int, crd_type)
static MYSQL_THDVAR_INT(
crd_weight, /* name */
PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_DEPRECATED, /* opt */
"Weight coefficient to calculate effectiveness of index from cardinality of column.", /* comment */
"Weight coefficient to calculate effectiveness of index from cardinality of column", /* comment */
NULL, /* check */
spider_var_deprecated_int, /* update */
2, /* def */
@@ -1397,7 +1397,7 @@ SPIDER_THDVAR_OVERRIDE_VALUE_FUNC(double, crd_weight)
static MYSQL_THDVAR_INT(
crd_bg_mode, /* name */
PLUGIN_VAR_RQCMDARG, /* opt */
"Mode of cardinality confirmation at background.", /* comment */
"Mode of cardinality confirmation at background", /* comment */
NULL, /* check */
spider_var_deprecated_int, /* update */
2, /* def */
@@ -1436,7 +1436,7 @@ SPIDER_THDVAR_OVERRIDE_VALUE_FUNC(double, sts_interval)
static MYSQL_THDVAR_INT(
sts_mode, /* name */
PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_DEPRECATED, /* opt */
"Mode of table state confirmation.", /* comment */
"Mode of table state confirmation", /* comment */
NULL, /* check */
spider_var_deprecated_int, /* update */
1, /* def */
@@ -1457,7 +1457,7 @@ SPIDER_THDVAR_OVERRIDE_VALUE_FUNC(int, sts_mode)
static MYSQL_THDVAR_INT(
sts_sync, /* name */
PLUGIN_VAR_RQCMDARG, /* opt */
"Table state synchronization in partitioned table.", /* comment */
"Table state synchronization in partitioned table", /* comment */
NULL, /* check */
spider_var_deprecated_int, /* update */
0, /* def */
@@ -1477,7 +1477,7 @@ SPIDER_THDVAR_OVERRIDE_VALUE_FUNC(int, sts_sync)
static MYSQL_THDVAR_INT(
sts_bg_mode, /* name */
PLUGIN_VAR_RQCMDARG, /* opt */
"Mode of table state confirmation at background.", /* comment */
"Mode of table state confirmation at background", /* comment */
NULL, /* check */
spider_var_deprecated_int, /* update */
2, /* def */
@@ -1515,7 +1515,7 @@ SPIDER_THDVAR_VALUE_FUNC(double, ping_interval_at_trx_start)
static MYSQL_THDVAR_INT(
auto_increment_mode, /* name */
PLUGIN_VAR_RQCMDARG, /* opt */
"Mode of auto increment.", /* comment */
"Mode of auto increment", /* comment */
NULL, /* check */
spider_var_deprecated_int, /* update */
0, /* def */