From 5296f908ed928fbb04c80e414ffe112577cf8f44 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Fri, 3 May 2024 19:19:03 +0200 Subject: [PATCH] MDEV-28671 post-testing fixes Various help message improvements: * MySQL->MariaDB, mysqld->mariadbd, "mysqld daemon" -> "mariadbd process" * typos * don't specify defaults directly in the help message * don't say that an option is deprecated, mark is as such * missing spaces in the middle of the text etc --- mysql-test/main/mysqld--help,win.rdiff | 22 +- mysql-test/main/mysqld--help.result | 117 +++--- .../sys_vars/r/sysvars_innodb,32bit.rdiff | 48 +-- .../suite/sys_vars/r/sysvars_innodb.result | 10 +- .../r/sysvars_server_embedded,32bit.rdiff | 20 +- .../sys_vars/r/sysvars_server_embedded.result | 50 +-- .../r/sysvars_server_notembedded,32bit.rdiff | 338 +++++++++--------- .../r/sysvars_server_notembedded.result | 66 ++-- .../sys_vars/r/sysvars_wsrep,32bit.rdiff | 12 +- .../suite/sys_vars/r/sysvars_wsrep.result | 2 +- sql/mysqld.cc | 31 +- sql/sys_vars.cc | 133 +++---- storage/innobase/handler/ha_innodb.cc | 9 +- storage/myisam/ha_myisam.cc | 2 +- 14 files changed, 430 insertions(+), 430 deletions(-) diff --git a/mysql-test/main/mysqld--help,win.rdiff b/mysql-test/main/mysqld--help,win.rdiff index c165df0ec23..bdfca1397c9 100644 --- a/mysql-test/main/mysqld--help,win.rdiff +++ b/mysql-test/main/mysqld--help,win.rdiff @@ -1,14 +1,14 @@ --- a/mysql-test/main/mysqld--help.result +++ b/mysql-test/main/mysqld--help.result -@@ -220,6 +220,7 @@ +@@ -216,6 +216,7 @@ The following specify which files/extra groups are read (specified before remain --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 --deadlock-search-depth-long=# Long search depth for the two-step deadlock detection -@@ -722,6 +723,7 @@ +@@ -717,6 +718,7 @@ The following specify which files/extra groups are read (specified before remain Use MySQL-5.6 (instead of MariaDB-5.3) format for TIME, DATETIME, TIMESTAMP columns (Defaults to on; use --skip-mysql56-temporal-format to disable.) @@ -16,18 +16,18 @@ --net-buffer-length=# Buffer length for TCP/IP and socket communication --net-read-timeout=# -@@ -1419,6 +1421,10 @@ +@@ -1414,6 +1416,10 @@ The following specify which files/extra groups are read (specified before remain 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 --socket=name Socket file to use for connection --sort-buffer-size=# Each thread that needs to do a sort allocates a buffer of -@@ -1443,6 +1449,7 @@ +@@ -1438,6 +1444,7 @@ The following specify which files/extra groups are read (specified before remain 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.) @@ -35,7 +35,7 @@ --standard-compliant-cte Allow only CTEs compliant to SQL standard (Defaults to on; use --skip-standard-compliant-cte to disable.) -@@ -1522,6 +1529,11 @@ +@@ -1517,6 +1524,11 @@ The following specify which files/extra groups are read (specified before remain --thread-pool-max-threads=# Maximum allowed number of worker threads in the thread pool @@ -47,7 +47,7 @@ --thread-pool-oversubscribe=# How many additional active worker threads in a group are allowed -@@ -1560,8 +1572,8 @@ +@@ -1555,8 +1567,8 @@ The following specify which files/extra groups are read (specified before remain automatically convert it to an on-disk MyISAM or Aria table -t, --tmpdir=name Path for temporary files. Several paths may be specified, @@ -58,7 +58,7 @@ --transaction-alloc-block-size=# Allocation block size for transactions to be stored in binary log -@@ -1788,6 +1800,7 @@ +@@ -1783,6 +1795,7 @@ myisam-sort-buffer-size 134216704 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 -@@ -1962,6 +1975,7 @@ +@@ -1957,6 +1970,7 @@ slave-transaction-retry-interval 0 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 -@@ -1989,6 +2003,8 @@ +@@ -1984,6 +1998,8 @@ thread-pool-dedicated-listener FALSE thread-pool-exact-stats FALSE thread-pool-idle-timeout 60 thread-pool-max-threads 65536 diff --git a/mysql-test/main/mysqld--help.result b/mysql-test/main/mysqld--help.result index 7f8ad747d71..db4c0f0ab3a 100644 --- a/mysql-test/main/mysqld--help.result +++ b/mysql-test/main/mysqld--help.result @@ -20,7 +20,7 @@ The following specify which files/extra groups are read (specified before remain Percentage of rows from the table ANALYZE TABLE will sample to collect table statistics. Set to 0 to let MariaDB decide what percentage of rows to sample - -a, --ansi Use ANSI SQL syntax instead of MySQL syntax. This mode + -a, --ansi Use ANSI SQL syntax instead of MariaDB syntax. This mode will also set transaction isolation level 'serializable' --auto-increment-increment[=#] Auto-increment columns are incremented by this @@ -34,7 +34,7 @@ The following specify which files/extra groups are read (specified before remain (Defaults to on; use --skip-automatic-sp-privileges to disable.) --back-log=# The number of outstanding connection requests MariaDB can have. This comes into play when the main MariaDB thread - gets very many connection requests in a very short time + gets many connection requests in a very short time (Automatically configured unless set explicitly) -b, --basedir=name Path to installation directory. All paths are usually resolved relative to this @@ -90,14 +90,11 @@ The following specify which files/extra groups are read (specified before remain --binlog-file-cache-size=# The size of file cache for the binary log --binlog-format=name - What form of binary logging the master will use: either - ROW for row-based binary logging, STATEMENT for - statement-based binary logging, or MIXED. MIXED is - statement-based binary logging except for those - statements where only row-based is correct: those which - involve user-defined functions (i.e. UDFs) or the UUID() - function; for those, row-based binary logging is - automatically used + The binary logging format the master will use: ROW for + row-based binary logging (safer), STATEMENT for + statement-based binary logging (smaller binary logs), + MIXED for statement-based binary logging when it's safe + with fall back to row-based otherwise --binlog-gtid-index Enable the creation of a GTID index for every binlog file, and the use of such index for speeding up GTID lookup in the binlog @@ -138,18 +135,17 @@ The following specify which files/extra groups are read (specified before remain logged. 'FULL_NODUP', means that all columns are logged in before image, but only changed columns or all columns of inserted record are logged in after image, 'NOBLOB', - means that mysqld avoids logging blob columns whenever + means that MariaDB avoids logging blob columns whenever possible (eg, blob column was not changed or is not part of primary key). 'MINIMAL', means that a PK equivalent (PK columns or full row if there is no PK in the table) is logged in the before image, and only changed columns - are logged in the after image. (Default: FULL) + are logged in the after image --binlog-row-metadata=name Controls whether metadata is logged using FULL , MINIMAL - format and NO_LOG.FULL causes all metadata to be logged; + format and NO_LOG. FULL causes all metadata to be logged; MINIMAL means that only metadata actually required by - slave is logged; NO_LOG NO metadata will be - logged.Default: NO_LOG + slave is logged; NO_LOG NO metadata will be logged --binlog-space-limit=# Alias for max_binlog_total_size. Compatibility with Percona server @@ -163,10 +159,10 @@ The following specify which files/extra groups are read (specified before remain AES_DECRYPT() functions. One of: aes-128-ecb, aes-192-ecb, aes-256-ecb, aes-128-cbc, aes-192-cbc, aes-256-cbc, aes-128-ctr, aes-192-ctr, aes-256-ctr - --bootstrap Used by mysql installation scripts + --bootstrap Used by MariaDB installation scripts --bulk-insert-buffer-size=# - Size of tree cache used in bulk insert optimisation. Note - that this is a limit per thread! + Size of tree cache used in bulk insert optimization. Note + that this is a limit per thread --character-set-client-handshake Don't ignore client side character set value sent during handshake @@ -179,7 +175,7 @@ The following specify which files/extra groups are read (specified before remain Set the default character set --character-sets-dir=name Directory where character sets are - -r, --chroot=name Chroot mysqld daemon during startup + -r, --chroot=name Chroot mariadbd process during startup --collation-server=name Set the default collation --column-compression-threshold=# @@ -218,7 +214,7 @@ The following specify which files/extra groups are read (specified before remain Use concurrent insert with MyISAM. One of: NEVER, AUTO, ALWAYS --console Write error output on screen; don't remove the console - window on windows + window on Windows --core-file Write core on crashes -h, --datadir=name Path to the database root directory --deadlock-search-depth-long=# @@ -318,7 +314,7 @@ The following specify which files/extra groups are read (specified before remain (Defaults to on; use --skip-explicit-defaults-for-timestamp to disable.) --external-locking 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. + (not repair) tables while the MariaDB server is running. Disable with --skip-external-locking --extra-max-connections=# The number of connections on extra-port @@ -347,11 +343,11 @@ The following specify which files/extra groups are read (specified before remain --gdb Set up signals usable for debugging. Deprecated, will be --general-log Log connections and queries to a table or log file. Defaults logging to a file 'hostname'.log or a table - mysql.general_logif --log-output=TABLE is used + mysql.general_log if --log-output=TABLE is used --general-log-file=name Log connections and queries to given file --getopt-prefix-matching - Recognize command-line options by their unambiguos + Recognize command-line options by their unambiguous prefixes (Defaults to on; use --skip-getopt-prefix-matching to disable.) --group-concat-max-len=# @@ -449,9 +445,7 @@ The following specify which files/extra groups are read (specified before remain is specified. Deprecated, will be removed in a future release. --key-buffer-size=# The size of the buffer used for index blocks for MyISAM - tables. Increase this to get better index handling (for - all reads and multiple writes) to as much as you can - afford + tables. Increase this to get faster index handling --key-cache-age-threshold=# This characterizes the number of hits a hot block has to be untouched until it is considered aged enough to be @@ -499,8 +493,8 @@ The following specify which files/extra groups are read (specified before remain stop if the real hostname of the computer changes --log-bin-compress Whether the binary log can be compressed --log-bin-compress-min-len[=#] - Minimum length of sql statement(in statement mode) or - record(in row mode)that can be compressed + Minimum length of sql statement (in statement mode) or + record (in row mode) that can be compressed --log-bin-index=name File that holds the names for last binary log files --log-bin-trust-function-creators @@ -545,10 +539,10 @@ The following specify which files/extra groups are read (specified before remain combinations --log-slow-filter=name Log only certain types of queries to the slow log. If - variable empty all kind of queries are logged. All types - are bound by slow_query_time, except 'not_using_index' - which is always logged if enabled. Any combination of: - admin, filesort, filesort_on_disk, + variable is empty all kinds of queries are logged. All + types are bound by slow_query_time, except + 'not_using_index' which is always logged if enabled. Any + combination of: admin, filesort, filesort_on_disk, filesort_priority_queue, full_join, full_scan, not_using_index, query_cache, query_cache_miss, tmp_table, tmp_table_on_disk, or ALL to set all combinations @@ -589,8 +583,9 @@ The following specify which files/extra groups are read (specified before remain when binary log is disabled) --log-tc-size=# Size of transaction coordinator log -W, --log-warnings[=#] - Log some non critical warnings to the error log.Value can - be between 0 and 11. Higher values mean more verbosity + Log some non-critical warnings to the error log. Value + can be between 0 and 11. Higher values mean more + verbosity --long-query-time=# Alias for log_slow_query_time. Log all queries that have taken more than long_query_time seconds to execute to the slow query log file. The argument will be treated as a @@ -681,11 +676,11 @@ The following specify which files/extra groups are read (specified before remain --max-write-lock-count=# After this many write locks, allow some read locks to run in between - --memlock Lock mysqld in memory + --memlock Lock mariadbd process in memory --metadata-locks-cache-size=# - Unused + Unused. Deprecated, will be removed in a future release. --metadata-locks-hash-instances=# - Unused + Unused. Deprecated, will be removed in a future release. --min-examined-row-limit=# Alias for log_slow_min_examined_row_limit. Don't write queries to slow log that examine fewer rows than that @@ -699,7 +694,7 @@ The following specify which files/extra groups are read (specified before remain the temporary file would get bigger than this --myisam-mmap-size=# Restricts the total memory used for memory mapping of - MySQL tables + MyISAM tables --myisam-recover-options[=name] Specifies how corrupted tables should be automatically repaired. Any combination of: DEFAULT, BACKUP, FORCE, @@ -753,9 +748,9 @@ The following specify which files/extra groups are read (specified before remain resources were counted per each user+host vs. per account) --open-files-limit=# - If this is not 0, then mysqld will use this value to + If this is not 0, then mariadbd will use this value to reserve file descriptors to use with setrlimit(). If this - value is 0 or autoset then mysqld will reserve + value is 0 or autoset then mariadbd will reserve max_connections*5 or max_connections + table_cache*2 (whichever is larger) number of file descriptors (Automatically configured unless set explicitly) @@ -775,7 +770,7 @@ The following specify which files/extra groups are read (specified before remain size or larger, then it will try aggressively prune away the search space --optimizer-index-block-copy-cost=# - Cost of copying a key block from the cache to intern + Cost of copying a key block from the cache to internal storage as part of an index scan --optimizer-key-compare-cost=# Cost of checking a key against the end key condition @@ -863,7 +858,7 @@ The following specify which files/extra groups are read (specified before remain any index to calculate the cardinality of a partial join, 4 - use histograms to calculate selectivity of range conditions that are not backed by any index to calculate - the cardinality of a partial join.5 - additionally use + the cardinality of a partial join. 5 - additionally use selectivity of certain non-range predicates calculated on record samples --optimizer-where-cost=# @@ -1030,7 +1025,7 @@ The following specify which files/extra groups are read (specified before remain --performance-schema-users-size=# Maximum number of instrumented users. Use 0 to disable, -1 for automated sizing - --pid-file=name Pid file used by safe_mysqld + --pid-file=name Pid file used by mariadbd-safe --plugin-dir=name Directory for plugins --plugin-load=name Semicolon-separated list of plugins to load, where each plugin is specified as ether a plugin_name=library_file @@ -1067,9 +1062,9 @@ The following specify which files/extra groups are read (specified before remain syntax is a comma separated list of IPv4 and IPv6 networks. If the network doesn't contain mask, it is considered to be a single host. "*" represents all - networks and must the only directive on the line. String - "localhost" represents non-TCP local connections (Unix - domain socket, Windows named pipe or shared memory) + networks and must be the only directive on the line. + String "localhost" represents non-TCP local connections + (Unix domain socket, Windows named pipe or shared memory) --query-alloc-block-size=# Allocation block size for query parsing and execution --query-cache-limit=# @@ -1243,7 +1238,7 @@ The following specify which files/extra groups are read (specified before remain Enable semi-synchronous replication slave (disabled by default) --rpl-semi-sync-slave-kill-conn-timeout[=#] - Timeout for the mysql connection used to kill the slave + Timeout for the MariaDB connection used to kill the slave io_thread's connection on master. This timeout comes into play when stop slave is executed --rpl-semi-sync-slave-trace-level=# @@ -1282,9 +1277,9 @@ The following specify which files/extra groups are read (specified before remain an active transaction? Does it have any data? etc.); CHARACTERISTICS to track transaction state and report all statements needed to start a transaction with the same - characteristics (isolation level, read only/read - write,snapshot - but not any work done / data modified - within the transaction) + characteristics (isolation level, read only/read write, + snapshot - but not any work done / data modified within + the transaction) --show-slave-auth-info Show user and password in SHOW SLAVE HOSTS on this master --silent-startup Don't print [Note] to the error log during startup @@ -1493,16 +1488,16 @@ The following specify which files/extra groups are read (specified before remain --tcp-keepalive-interval=# The interval, in seconds, between when successive keep-alive packets are sent if no acknowledgement is - received.If set to 0, system dependent default is used + received. If set to 0, system dependent default is used (Automatically configured unless set explicitly) --tcp-keepalive-probes=# The number of unacknowledged probes to send before considering the connection dead and notifying the - application layer.If set to 0, system dependent default + application layer. If set to 0, system dependent default is used (Automatically configured unless set explicitly) --tcp-keepalive-time=# Timeout, in seconds, with no activity until the first TCP - keep-alive packet is sent.If set to 0, system dependent + keep-alive packet is sent. If set to 0, system dependent default is used (Automatically configured unless set explicitly) --tcp-nodelay Set option TCP_NODELAY (disable Nagle's algorithm) on @@ -1517,8 +1512,8 @@ The following specify which files/extra groups are read (specified before remain If set to 1, provides better statistics in information_schema threadpool tables --thread-pool-idle-timeout=# - Timeout in seconds for an idle thread in the thread - pool.Worker thread will be shut down after timeout + Timeout in seconds for an idle thread in the thread pool. + Worker thread will be shut down after timeout --thread-pool-max-threads=# Maximum allowed number of worker threads in the thread pool @@ -1530,8 +1525,8 @@ The following specify which files/extra groups are read (specified before remain statement is moved to the high-priority queue --thread-pool-priority=name 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 + 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 --thread-pool-size=# @@ -1540,8 +1535,8 @@ The following specify which files/extra groups are read (specified before remain executing threads (threads in a waiting state do not count as executing) --thread-pool-stall-limit=# - Maximum query execution time in milliseconds,before an - executing non-yielding thread is considered stalled.If a + 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 --thread-stack=# The stack size for each thread @@ -1586,7 +1581,7 @@ The following specify which files/extra groups are read (specified before remain Specifies how to use system statistics tables. One of: NEVER, COMPLEMENTARY, PREFERABLY, COMPLEMENTARY_FOR_QUERIES, PREFERABLY_FOR_QUERIES - -u, --user=name Run mysqld daemon as user + -u, --user=name User to run mariadbd process as --userstat Enables statistics gathering for USER_STATISTICS, CLIENT_STATISTICS, INDEX_STATISTICS and TABLE_STATISTICS tables in the INFORMATION_SCHEMA @@ -2008,4 +2003,4 @@ verbose TRUE wait-timeout 28800 To see what variables a running server is using, type -'SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES' instead of 'mysqld --verbose --help' or 'mariadbd --verbose --help'. +'SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES' instead of 'mariadbd --verbose --help'. diff --git a/mysql-test/suite/sys_vars/r/sysvars_innodb,32bit.rdiff b/mysql-test/suite/sys_vars/r/sysvars_innodb,32bit.rdiff index 6d9eaf244a1..87958c58234 100644 --- a/mysql-test/suite/sys_vars/r/sysvars_innodb,32bit.rdiff +++ b/mysql-test/suite/sys_vars/r/sysvars_innodb,32bit.rdiff @@ -1,6 +1,6 @@ ---- sysvars_innodb.result -+++ sysvars_innodb.result -@@ -47,7 +47,7 @@ +--- a/mysql-test/suite/sys_vars/r/sysvars_innodb.result ++++ b/mysql-test/suite/sys_vars/r/sysvars_innodb.result +@@ -47,7 +47,7 @@ VARIABLE_NAME INNODB_ADAPTIVE_HASH_INDEX_PARTS SESSION_VALUE NULL DEFAULT_VALUE 8 VARIABLE_SCOPE GLOBAL @@ -9,7 +9,7 @@ VARIABLE_COMMENT Number of InnoDB Adaptive Hash Index Partitions (default 8) NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 512 -@@ -71,7 +71,7 @@ +@@ -71,7 +71,7 @@ VARIABLE_NAME INNODB_AUTOINC_LOCK_MODE SESSION_VALUE NULL DEFAULT_VALUE 1 VARIABLE_SCOPE GLOBAL @@ -18,7 +18,7 @@ VARIABLE_COMMENT The AUTOINC lock modes supported by InnoDB: 0 => Old style AUTOINC locking (for backward compatibility); 1 => New style AUTOINC locking; 2 => No AUTOINC locking (unsafe for SBR) NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 2 -@@ -83,10 +83,10 @@ +@@ -83,10 +83,10 @@ VARIABLE_NAME INNODB_BUFFER_POOL_CHUNK_SIZE SESSION_VALUE NULL DEFAULT_VALUE 0 VARIABLE_SCOPE GLOBAL @@ -31,7 +31,7 @@ NUMERIC_BLOCK_SIZE 1048576 ENUM_VALUE_LIST NULL READ_ONLY YES -@@ -119,7 +119,7 @@ +@@ -119,7 +119,7 @@ VARIABLE_NAME INNODB_BUFFER_POOL_DUMP_PCT SESSION_VALUE NULL DEFAULT_VALUE 25 VARIABLE_SCOPE GLOBAL @@ -40,16 +40,16 @@ VARIABLE_COMMENT Dump only the hottest N% of each buffer pool, defaults to 25 NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 100 -@@ -203,7 +203,7 @@ +@@ -203,7 +203,7 @@ VARIABLE_NAME INNODB_BUF_DUMP_STATUS_FREQUENCY SESSION_VALUE NULL DEFAULT_VALUE 0 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 that tells how often 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 -@@ -275,7 +275,7 @@ +@@ -275,7 +275,7 @@ VARIABLE_NAME INNODB_COMPRESSION_FAILURE_THRESHOLD_PCT SESSION_VALUE NULL DEFAULT_VALUE 5 VARIABLE_SCOPE GLOBAL @@ -58,7 +58,7 @@ 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 -@@ -299,7 +299,7 @@ +@@ -299,7 +299,7 @@ VARIABLE_NAME INNODB_COMPRESSION_PAD_PCT_MAX SESSION_VALUE NULL DEFAULT_VALUE 50 VARIABLE_SCOPE GLOBAL @@ -67,7 +67,7 @@ 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 -@@ -527,7 +527,7 @@ +@@ -527,7 +527,7 @@ VARIABLE_NAME INNODB_FATAL_SEMAPHORE_WAIT_THRESHOLD SESSION_VALUE NULL DEFAULT_VALUE 600 VARIABLE_SCOPE GLOBAL @@ -76,7 +76,7 @@ VARIABLE_COMMENT Maximum number of seconds that semaphore times out in InnoDB NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 4294967295 -@@ -575,7 +575,7 @@ +@@ -575,7 +575,7 @@ VARIABLE_NAME INNODB_FLUSHING_AVG_LOOPS SESSION_VALUE NULL DEFAULT_VALUE 30 VARIABLE_SCOPE GLOBAL @@ -85,7 +85,7 @@ VARIABLE_COMMENT Number of iterations over which the background flushing is averaged NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 1000 -@@ -599,7 +599,7 @@ +@@ -599,7 +599,7 @@ VARIABLE_NAME INNODB_FLUSH_LOG_AT_TRX_COMMIT SESSION_VALUE NULL DEFAULT_VALUE 1 VARIABLE_SCOPE GLOBAL @@ -94,7 +94,7 @@ 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 -@@ -623,7 +623,7 @@ +@@ -623,7 +623,7 @@ VARIABLE_NAME INNODB_FLUSH_NEIGHBORS SESSION_VALUE NULL DEFAULT_VALUE 1 VARIABLE_SCOPE GLOBAL @@ -103,7 +103,7 @@ 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 -@@ -659,7 +659,7 @@ +@@ -659,7 +659,7 @@ VARIABLE_NAME INNODB_FORCE_RECOVERY SESSION_VALUE NULL DEFAULT_VALUE 0 VARIABLE_SCOPE GLOBAL @@ -112,7 +112,7 @@ 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 -@@ -683,10 +683,10 @@ +@@ -683,10 +683,10 @@ VARIABLE_NAME INNODB_FT_CACHE_SIZE SESSION_VALUE NULL DEFAULT_VALUE 8000000 VARIABLE_SCOPE GLOBAL @@ -125,7 +125,7 @@ NUMERIC_BLOCK_SIZE 0 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -719,7 +719,7 @@ +@@ -719,7 +719,7 @@ VARIABLE_NAME INNODB_FT_MAX_TOKEN_SIZE 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 -@@ -731,7 +731,7 @@ +@@ -731,7 +731,7 @@ VARIABLE_NAME INNODB_FT_MIN_TOKEN_SIZE SESSION_VALUE NULL DEFAULT_VALUE 3 VARIABLE_SCOPE GLOBAL @@ -143,7 +143,7 @@ VARIABLE_COMMENT InnoDB Fulltext search minimum token size in characters NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 16 -@@ -743,7 +743,7 @@ +@@ -743,7 +743,7 @@ VARIABLE_NAME INNODB_FT_NUM_WORD_OPTIMIZE SESSION_VALUE NULL DEFAULT_VALUE 2000 VARIABLE_SCOPE GLOBAL @@ -152,7 +152,7 @@ VARIABLE_COMMENT InnoDB Fulltext search number of words to optimize for each optimize table call NUMERIC_MIN_VALUE 1000 NUMERIC_MAX_VALUE 10000 -@@ -755,10 +755,10 @@ +@@ -755,10 +755,10 @@ VARIABLE_NAME INNODB_FT_RESULT_CACHE_LIMIT SESSION_VALUE NULL DEFAULT_VALUE 2000000000 VARIABLE_SCOPE GLOBAL @@ -165,7 +165,7 @@ NUMERIC_BLOCK_SIZE 0 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -779,7 +779,7 @@ +@@ -779,7 +779,7 @@ VARIABLE_NAME INNODB_FT_SORT_PLL_DEGREE 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 -@@ -791,10 +791,10 @@ +@@ -791,10 +791,10 @@ VARIABLE_NAME INNODB_FT_TOTAL_CACHE_SIZE SESSION_VALUE NULL DEFAULT_VALUE 640000000 VARIABLE_SCOPE GLOBAL @@ -187,7 +187,7 @@ NUMERIC_BLOCK_SIZE 0 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -839,22 +839,22 @@ +@@ -839,22 +839,22 @@ VARIABLE_NAME INNODB_IO_CAPACITY SESSION_VALUE NULL DEFAULT_VALUE 200 VARIABLE_SCOPE GLOBAL @@ -300,7 +300,7 @@ VARIABLE_SCOPE GLOBAL -VARIABLE_TYPE BIGINT UNSIGNED +VARIABLE_TYPE INT UNSIGNED - VARIABLE_COMMENT Deprecated parameter with no effect + VARIABLE_COMMENT Unused NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 128 @@ -1259,7 +1259,7 @@ diff --git a/mysql-test/suite/sys_vars/r/sysvars_innodb.result b/mysql-test/suite/sys_vars/r/sysvars_innodb.result index 0e9222fa0c1..d0ba5ceb239 100644 --- a/mysql-test/suite/sys_vars/r/sysvars_innodb.result +++ b/mysql-test/suite/sys_vars/r/sysvars_innodb.result @@ -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 that tells how often 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 @@ -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 Encrypt the temporary table data NUMERIC_MIN_VALUE NULL NUMERIC_MAX_VALUE NULL NUMERIC_BLOCK_SIZE NULL @@ -1185,10 +1185,10 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME INNODB_PREFIX_INDEX_CLUSTER_OPTIMIZATION SESSION_VALUE NULL -DEFAULT_VALUE ON +DEFAULT_VALUE OFF VARIABLE_SCOPE GLOBAL VARIABLE_TYPE BOOLEAN -VARIABLE_COMMENT Deprecated parameter with no effect +VARIABLE_COMMENT Unused NUMERIC_MIN_VALUE NULL NUMERIC_MAX_VALUE NULL NUMERIC_BLOCK_SIZE NULL @@ -1224,7 +1224,7 @@ SESSION_VALUE NULL DEFAULT_VALUE 128 VARIABLE_SCOPE GLOBAL VARIABLE_TYPE BIGINT UNSIGNED -VARIABLE_COMMENT Deprecated parameter with no effect +VARIABLE_COMMENT Unused NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 128 NUMERIC_BLOCK_SIZE 0 diff --git a/mysql-test/suite/sys_vars/r/sysvars_server_embedded,32bit.rdiff b/mysql-test/suite/sys_vars/r/sysvars_server_embedded,32bit.rdiff index b89e14dc1fb..e5ad11b2d82 100644 --- a/mysql-test/suite/sys_vars/r/sysvars_server_embedded,32bit.rdiff +++ b/mysql-test/suite/sys_vars/r/sysvars_server_embedded,32bit.rdiff @@ -1,5 +1,5 @@ ---- sysvars_server_embedded.result 2024-02-15 09:34:10.105925200 +0100 -+++ sysvars_server_embedded,32bit.result 2024-02-15 13:49:05.823558727 +0100 +--- a/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result ++++ b/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result @@ -44,7 +44,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME ARIA_BLOCK_SIZE @@ -127,7 +127,7 @@ VARIABLE_SCOPE GLOBAL -VARIABLE_TYPE BIGINT UNSIGNED +VARIABLE_TYPE INT UNSIGNED - VARIABLE_COMMENT The number of outstanding connection requests MariaDB can have. This comes into play when the main MariaDB thread gets very many connection requests in a very short time + VARIABLE_COMMENT The number of outstanding connection requests MariaDB can have. This comes into play when the main MariaDB thread gets many connection requests in a very short time NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 65535 @@ -357,7 +357,7 @@ @@ -193,7 +193,7 @@ READ_ONLY NO @@ -527,7 +527,7 @@ VARIABLE_TYPE BIGINT UNSIGNED - VARIABLE_COMMENT Size of tree cache used in bulk insert optimisation. Note that this is a limit per thread! + VARIABLE_COMMENT Size of tree cache used in bulk insert optimization. Note that this is a limit per thread NUMERIC_MIN_VALUE 0 -NUMERIC_MAX_VALUE 18446744073709551615 +NUMERIC_MAX_VALUE 4294967295 @@ -206,7 +206,7 @@ VARIABLE_SCOPE GLOBAL -VARIABLE_TYPE BIGINT UNSIGNED +VARIABLE_TYPE INT UNSIGNED - VARIABLE_COMMENT The number of seconds the mysqld server is waiting for a connect packet before responding with 'Bad handshake' + VARIABLE_COMMENT The number of seconds the MariaDB server is waiting for a connect packet before responding with 'Bad handshake' NUMERIC_MIN_VALUE 2 NUMERIC_MAX_VALUE 31536000 @@ -754,7 +754,7 @@ @@ -382,7 +382,7 @@ NUMERIC_MAX_VALUE 8 @@ -1467,7 +1467,7 @@ VARIABLE_TYPE BIGINT UNSIGNED - VARIABLE_COMMENT The size of the buffer used for index blocks for MyISAM 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 MyISAM tables. Increase this to get faster index handling NUMERIC_MIN_VALUE 0 -NUMERIC_MAX_VALUE 18446744073709551615 +NUMERIC_MAX_VALUE 4294967295 @@ -431,7 +431,7 @@ VARIABLE_SCOPE SESSION -VARIABLE_TYPE BIGINT UNSIGNED +VARIABLE_TYPE INT UNSIGNED - VARIABLE_COMMENT Log some non critical warnings to the error log.Value can be between 0 and 11. Higher values mean more verbosity + VARIABLE_COMMENT Log some non-critical warnings to the error log. Value can be between 0 and 11. Higher values mean more verbosity NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 @@ -1874,7 +1874,7 @@ @@ -640,7 +640,7 @@ NUMERIC_MAX_VALUE 7 @@ -2197,7 +2197,7 @@ VARIABLE_TYPE BIGINT UNSIGNED - VARIABLE_COMMENT Restricts the total memory used for memory mapping of MySQL tables + VARIABLE_COMMENT Restricts the total memory used for memory mapping of MyISAM tables NUMERIC_MIN_VALUE 7 -NUMERIC_MAX_VALUE 18446744073709551615 +NUMERIC_MAX_VALUE 4294967295 @@ -711,7 +711,7 @@ VARIABLE_SCOPE GLOBAL -VARIABLE_TYPE BIGINT UNSIGNED +VARIABLE_TYPE INT UNSIGNED - VARIABLE_COMMENT If this is not 0, then mysqld will use this value to reserve file descriptors to use with setrlimit(). If this value is 0 or autoset then mysqld will reserve max_connections*5 or max_connections + table_cache*2 (whichever is larger) number of file descriptors + VARIABLE_COMMENT If this is not 0, then mariadbd will use this value to reserve file descriptors to use with setrlimit(). If this value is 0 or autoset then mariadbd will reserve max_connections*5 or max_connections + table_cache*2 (whichever is larger) number of file descriptors NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 @@ -2354,7 +2354,7 @@ @@ -795,7 +795,7 @@ VARIABLE_SCOPE SESSION -VARIABLE_TYPE BIGINT UNSIGNED +VARIABLE_TYPE INT UNSIGNED - VARIABLE_COMMENT Controls selectivity of which conditions the optimizer takes into account to calculate cardinality of a partial join when it searches for the best execution plan Meaning: 1 - use selectivity of index backed range conditions to calculate the cardinality of a partial join if the last joined table is accessed by full table scan or an index scan, 2 - use selectivity of index backed range conditions to calculate the cardinality of a partial join in any case, 3 - additionally always use selectivity of range conditions that are not backed by any index to calculate the cardinality of a partial join, 4 - use histograms to calculate selectivity of range conditions that are not backed by any index to calculate the cardinality of a partial join.5 - additionally use selectivity of certain non-range predicates calculated on record samples + VARIABLE_COMMENT Controls selectivity of which conditions the optimizer takes into account to calculate cardinality of a partial join when it searches for the best execution plan Meaning: 1 - use selectivity of index backed range conditions to calculate the cardinality of a partial join if the last joined table is accessed by full table scan or an index scan, 2 - use selectivity of index backed range conditions to calculate the cardinality of a partial join in any case, 3 - additionally always use selectivity of range conditions that are not backed by any index to calculate the cardinality of a partial join, 4 - use histograms to calculate selectivity of range conditions that are not backed by any index to calculate the cardinality of a partial join. 5 - additionally use selectivity of certain non-range predicates calculated on record samples NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 5 @@ -2614,7 +2614,7 @@ diff --git a/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result b/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result index 5eef30779eb..6f8b1cf9fb2 100644 --- a/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result +++ b/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result @@ -305,7 +305,7 @@ COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME BACK_LOG VARIABLE_SCOPE GLOBAL VARIABLE_TYPE BIGINT UNSIGNED -VARIABLE_COMMENT The number of outstanding connection requests MariaDB can have. This comes into play when the main MariaDB thread gets very many connection requests in a very short time +VARIABLE_COMMENT The number of outstanding connection requests MariaDB can have. This comes into play when the main MariaDB thread gets many connection requests in a very short time NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 65535 NUMERIC_BLOCK_SIZE 1 @@ -425,7 +425,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME BINLOG_FORMAT VARIABLE_SCOPE SESSION VARIABLE_TYPE ENUM -VARIABLE_COMMENT What form of binary logging the master will use: either ROW for row-based binary logging, STATEMENT for statement-based binary logging, or MIXED. MIXED is statement-based binary logging except for those statements where only row-based is correct: those which involve user-defined functions (i.e. UDFs) or the UUID() function; for those, row-based binary logging is automatically used +VARIABLE_COMMENT The binary logging format the master will use: ROW for row-based binary logging (safer), STATEMENT for statement-based binary logging (smaller binary logs), MIXED for statement-based binary logging when it's safe with fall back to row-based otherwise NUMERIC_MIN_VALUE NULL NUMERIC_MAX_VALUE NULL NUMERIC_BLOCK_SIZE NULL @@ -475,7 +475,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME BINLOG_ROW_IMAGE VARIABLE_SCOPE SESSION VARIABLE_TYPE ENUM -VARIABLE_COMMENT Controls whether rows should be logged in 'FULL', 'FULL_NODUP', 'NOBLOB' or 'MINIMAL' formats. 'FULL', means that all columns in the before and after image are logged. 'FULL_NODUP', means that all columns are logged in before image, but only changed columns or all columns of inserted record are logged in after image, 'NOBLOB', means that mysqld avoids logging blob columns whenever possible (eg, blob column was not changed or is not part of primary key). 'MINIMAL', means that a PK equivalent (PK columns or full row if there is no PK in the table) is logged in the before image, and only changed columns are logged in the after image. (Default: FULL) +VARIABLE_COMMENT Controls whether rows should be logged in 'FULL', 'FULL_NODUP', 'NOBLOB' or 'MINIMAL' formats. 'FULL', means that all columns in the before and after image are logged. 'FULL_NODUP', means that all columns are logged in before image, but only changed columns or all columns of inserted record are logged in after image, 'NOBLOB', means that MariaDB avoids logging blob columns whenever possible (eg, blob column was not changed or is not part of primary key). 'MINIMAL', means that a PK equivalent (PK columns or full row if there is no PK in the table) is logged in the before image, and only changed columns are logged in the after image NUMERIC_MIN_VALUE NULL NUMERIC_MAX_VALUE NULL NUMERIC_BLOCK_SIZE NULL @@ -485,7 +485,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME BINLOG_ROW_METADATA VARIABLE_SCOPE GLOBAL VARIABLE_TYPE ENUM -VARIABLE_COMMENT Controls whether metadata is logged using FULL , MINIMAL format and NO_LOG.FULL causes all metadata to be logged; MINIMAL means that only metadata actually required by slave is logged; NO_LOG NO metadata will be logged.Default: NO_LOG +VARIABLE_COMMENT Controls whether metadata is logged using FULL , MINIMAL format and NO_LOG. FULL causes all metadata to be logged; MINIMAL means that only metadata actually required by slave is logged; NO_LOG NO metadata will be logged NUMERIC_MIN_VALUE NULL NUMERIC_MAX_VALUE NULL NUMERIC_BLOCK_SIZE NULL @@ -525,7 +525,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME BULK_INSERT_BUFFER_SIZE VARIABLE_SCOPE SESSION VARIABLE_TYPE BIGINT UNSIGNED -VARIABLE_COMMENT Size of tree cache used in bulk insert optimisation. Note that this is a limit per thread! +VARIABLE_COMMENT Size of tree cache used in bulk insert optimization. Note that this is a limit per thread NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 18446744073709551615 NUMERIC_BLOCK_SIZE 1 @@ -725,7 +725,7 @@ COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME CONNECT_TIMEOUT VARIABLE_SCOPE GLOBAL VARIABLE_TYPE BIGINT UNSIGNED -VARIABLE_COMMENT The number of seconds the mysqld server is waiting for a connect packet before responding with 'Bad handshake' +VARIABLE_COMMENT The number of seconds the MariaDB server is waiting for a connect packet before responding with 'Bad handshake' NUMERIC_MIN_VALUE 2 NUMERIC_MAX_VALUE 31536000 NUMERIC_BLOCK_SIZE 1 @@ -1105,7 +1105,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME GENERAL_LOG VARIABLE_SCOPE GLOBAL VARIABLE_TYPE BOOLEAN -VARIABLE_COMMENT Log connections and queries to a table or log file. Defaults logging to a file 'hostname'.log or a table mysql.general_logif --log-output=TABLE is used +VARIABLE_COMMENT Log connections and queries to a table or log file. Defaults logging to a file 'hostname'.log or a table mysql.general_log if --log-output=TABLE is used NUMERIC_MIN_VALUE NULL NUMERIC_MAX_VALUE NULL NUMERIC_BLOCK_SIZE NULL @@ -1235,7 +1235,7 @@ COMMAND_LINE_ARGUMENT NULL VARIABLE_NAME HAVE_SSL VARIABLE_SCOPE GLOBAL VARIABLE_TYPE VARCHAR -VARIABLE_COMMENT If the server supports secure connections, will be set to YES, otherwise will be set to NO. If set to DISABLED, the server was compiled with TLS support, but was not started with TLS support (see the mysqld options). See also have_openssl +VARIABLE_COMMENT If the server supports secure connections, will be set to YES, otherwise will be set to NO. If set to DISABLED, the server was compiled with TLS support, but was not started with TLS support (see the mariadbd options). See also have_openssl NUMERIC_MIN_VALUE NULL NUMERIC_MAX_VALUE NULL NUMERIC_BLOCK_SIZE NULL @@ -1465,7 +1465,7 @@ COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME KEY_BUFFER_SIZE VARIABLE_SCOPE GLOBAL VARIABLE_TYPE BIGINT UNSIGNED -VARIABLE_COMMENT The size of the buffer used for index blocks for MyISAM 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 MyISAM tables. Increase this to get faster index handling NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 18446744073709551615 NUMERIC_BLOCK_SIZE 4096 @@ -1525,7 +1525,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME LARGE_FILES_SUPPORT VARIABLE_SCOPE GLOBAL VARIABLE_TYPE BOOLEAN -VARIABLE_COMMENT Whether mysqld was compiled with options for large file support +VARIABLE_COMMENT Whether mariadbd was compiled with options for large file support NUMERIC_MIN_VALUE NULL NUMERIC_MAX_VALUE NULL NUMERIC_BLOCK_SIZE NULL @@ -1615,7 +1615,7 @@ COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME LOCKED_IN_MEMORY VARIABLE_SCOPE GLOBAL VARIABLE_TYPE BOOLEAN -VARIABLE_COMMENT Whether mysqld was locked in memory with --memlock +VARIABLE_COMMENT Whether mariadbd process was locked in memory with --memlock NUMERIC_MIN_VALUE NULL NUMERIC_MAX_VALUE NULL NUMERIC_BLOCK_SIZE NULL @@ -1655,7 +1655,7 @@ COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME LOG_BIN_COMPRESS_MIN_LEN VARIABLE_SCOPE GLOBAL VARIABLE_TYPE INT UNSIGNED -VARIABLE_COMMENT Minimum length of sql statement(in statement mode) or record(in row mode)that can be compressed +VARIABLE_COMMENT Minimum length of sql statement (in statement mode) or record (in row mode) that can be compressed NUMERIC_MIN_VALUE 10 NUMERIC_MAX_VALUE 1024 NUMERIC_BLOCK_SIZE 1 @@ -1735,7 +1735,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME LOG_SLOW_FILTER VARIABLE_SCOPE SESSION VARIABLE_TYPE SET -VARIABLE_COMMENT Log only certain types of queries to the slow log. If variable empty all kind of queries are logged. All types are bound by slow_query_time, except 'not_using_index' which is always logged if enabled +VARIABLE_COMMENT Log only certain types of queries to the slow log. If variable is empty all kinds of queries are logged. All types are bound by slow_query_time, except 'not_using_index' which is always logged if enabled NUMERIC_MIN_VALUE NULL NUMERIC_MAX_VALUE NULL NUMERIC_BLOCK_SIZE NULL @@ -1825,7 +1825,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME LOG_WARNINGS VARIABLE_SCOPE SESSION VARIABLE_TYPE BIGINT UNSIGNED -VARIABLE_COMMENT Log some non critical warnings to the error log.Value can be between 0 and 11. Higher values mean more verbosity +VARIABLE_COMMENT Log some non-critical warnings to the error log. Value can be between 0 and 11. Higher values mean more verbosity NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 NUMERIC_BLOCK_SIZE 1 @@ -2195,7 +2195,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME MYISAM_MMAP_SIZE VARIABLE_SCOPE GLOBAL VARIABLE_TYPE BIGINT UNSIGNED -VARIABLE_COMMENT Restricts the total memory used for memory mapping of MySQL tables +VARIABLE_COMMENT Restricts the total memory used for memory mapping of MyISAM tables NUMERIC_MIN_VALUE 7 NUMERIC_MAX_VALUE 18446744073709551615 NUMERIC_BLOCK_SIZE 1 @@ -2345,7 +2345,7 @@ COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME OPEN_FILES_LIMIT VARIABLE_SCOPE GLOBAL VARIABLE_TYPE BIGINT UNSIGNED -VARIABLE_COMMENT If this is not 0, then mysqld will use this value to reserve file descriptors to use with setrlimit(). If this value is 0 or autoset then mysqld will reserve max_connections*5 or max_connections + table_cache*2 (whichever is larger) number of file descriptors +VARIABLE_COMMENT If this is not 0, then mariadbd will use this value to reserve file descriptors to use with setrlimit(). If this value is 0 or autoset then mariadbd will reserve max_connections*5 or max_connections + table_cache*2 (whichever is larger) number of file descriptors NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 NUMERIC_BLOCK_SIZE 1 @@ -2395,7 +2395,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME OPTIMIZER_INDEX_BLOCK_COPY_COST VARIABLE_SCOPE GLOBAL VARIABLE_TYPE DOUBLE -VARIABLE_COMMENT Cost of copying a key block from the cache to intern storage as part of an index scan +VARIABLE_COMMENT Cost of copying a key block from the cache to internal storage as part of an index scan NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 1000 NUMERIC_BLOCK_SIZE NULL @@ -2585,7 +2585,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME OPTIMIZER_USE_CONDITION_SELECTIVITY VARIABLE_SCOPE SESSION VARIABLE_TYPE BIGINT UNSIGNED -VARIABLE_COMMENT Controls selectivity of which conditions the optimizer takes into account to calculate cardinality of a partial join when it searches for the best execution plan Meaning: 1 - use selectivity of index backed range conditions to calculate the cardinality of a partial join if the last joined table is accessed by full table scan or an index scan, 2 - use selectivity of index backed range conditions to calculate the cardinality of a partial join in any case, 3 - additionally always use selectivity of range conditions that are not backed by any index to calculate the cardinality of a partial join, 4 - use histograms to calculate selectivity of range conditions that are not backed by any index to calculate the cardinality of a partial join.5 - additionally use selectivity of certain non-range predicates calculated on record samples +VARIABLE_COMMENT Controls selectivity of which conditions the optimizer takes into account to calculate cardinality of a partial join when it searches for the best execution plan Meaning: 1 - use selectivity of index backed range conditions to calculate the cardinality of a partial join if the last joined table is accessed by full table scan or an index scan, 2 - use selectivity of index backed range conditions to calculate the cardinality of a partial join in any case, 3 - additionally always use selectivity of range conditions that are not backed by any index to calculate the cardinality of a partial join, 4 - use histograms to calculate selectivity of range conditions that are not backed by any index to calculate the cardinality of a partial join. 5 - additionally use selectivity of certain non-range predicates calculated on record samples NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 5 NUMERIC_BLOCK_SIZE 1 @@ -3025,7 +3025,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PID_FILE VARIABLE_SCOPE GLOBAL VARIABLE_TYPE VARCHAR -VARIABLE_COMMENT Pid file used by safe_mysqld +VARIABLE_COMMENT Pid file used by mariadbd-safe NUMERIC_MIN_VALUE NULL NUMERIC_MAX_VALUE NULL NUMERIC_BLOCK_SIZE NULL @@ -3115,7 +3115,7 @@ COMMAND_LINE_ARGUMENT NULL VARIABLE_NAME PROXY_PROTOCOL_NETWORKS VARIABLE_SCOPE GLOBAL VARIABLE_TYPE VARCHAR -VARIABLE_COMMENT Enable proxy protocol for these source networks. The syntax is a comma separated list of IPv4 and IPv6 networks. If the network doesn't contain mask, it is considered to be a single host. "*" represents all networks and must the only directive on the line. String "localhost" represents non-TCP local connections (Unix domain socket, Windows named pipe or shared memory) +VARIABLE_COMMENT Enable proxy protocol for these source networks. The syntax is a comma separated list of IPv4 and IPv6 networks. If the network doesn't contain mask, it is considered to be a single host. "*" represents all networks and must be the only directive on the line. String "localhost" represents non-TCP local connections (Unix domain socket, Windows named pipe or shared memory) NUMERIC_MIN_VALUE NULL NUMERIC_MAX_VALUE NULL NUMERIC_BLOCK_SIZE NULL @@ -3825,7 +3825,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME TCP_KEEPALIVE_INTERVAL VARIABLE_SCOPE GLOBAL VARIABLE_TYPE INT -VARIABLE_COMMENT The interval, in seconds, between when successive keep-alive packets are sent if no acknowledgement is received.If set to 0, system dependent default is used +VARIABLE_COMMENT The interval, in seconds, between when successive keep-alive packets are sent if no acknowledgement is received. If set to 0, system dependent default is used NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 2147483 NUMERIC_BLOCK_SIZE 1 @@ -3835,7 +3835,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME TCP_KEEPALIVE_PROBES VARIABLE_SCOPE GLOBAL VARIABLE_TYPE INT -VARIABLE_COMMENT The number of unacknowledged probes to send before considering the connection dead and notifying the application layer.If set to 0, system dependent default is used +VARIABLE_COMMENT The number of unacknowledged probes to send before considering the connection dead and notifying the application layer. If set to 0, system dependent default is used NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 2147483 NUMERIC_BLOCK_SIZE 1 @@ -3845,7 +3845,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME TCP_KEEPALIVE_TIME VARIABLE_SCOPE GLOBAL VARIABLE_TYPE INT -VARIABLE_COMMENT Timeout, in seconds, with no activity until the first TCP keep-alive packet is sent.If set to 0, system dependent default is used +VARIABLE_COMMENT Timeout, in seconds, with no activity until the first TCP keep-alive packet is sent. If set to 0, system dependent default is used NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 2147483 NUMERIC_BLOCK_SIZE 1 @@ -4005,7 +4005,7 @@ COMMAND_LINE_ARGUMENT NULL VARIABLE_NAME TX_ISOLATION VARIABLE_SCOPE SESSION VARIABLE_TYPE ENUM -VARIABLE_COMMENT Default transaction isolation level.This variable is deprecated and will be removed in a future release +VARIABLE_COMMENT Default transaction isolation level NUMERIC_MIN_VALUE NULL NUMERIC_MAX_VALUE NULL NUMERIC_BLOCK_SIZE NULL @@ -4015,7 +4015,7 @@ COMMAND_LINE_ARGUMENT NULL VARIABLE_NAME TX_READ_ONLY VARIABLE_SCOPE SESSION VARIABLE_TYPE BOOLEAN -VARIABLE_COMMENT Default transaction access mode. If set to OFF, the default, access is read/write. If set to ON, access is read-only. The SET TRANSACTION statement can also change the value of this variable. See SET TRANSACTION and START TRANSACTION.This variable is deprecated and will be removed in a future release +VARIABLE_COMMENT Default transaction access mode. If set to OFF, the default, access is read/write. If set to ON, access is read-only. The SET TRANSACTION statement can also change the value of this variable. See SET TRANSACTION and START TRANSACTION NUMERIC_MIN_VALUE NULL NUMERIC_MAX_VALUE NULL NUMERIC_BLOCK_SIZE NULL diff --git a/mysql-test/suite/sys_vars/r/sysvars_server_notembedded,32bit.rdiff b/mysql-test/suite/sys_vars/r/sysvars_server_notembedded,32bit.rdiff index 2015b5a4a48..f2e6858616a 100644 --- a/mysql-test/suite/sys_vars/r/sysvars_server_notembedded,32bit.rdiff +++ b/mysql-test/suite/sys_vars/r/sysvars_server_notembedded,32bit.rdiff @@ -1,6 +1,6 @@ ---- sysvars_server_notembedded.result 2024-02-15 09:34:10.109925277 +0100 -+++ sysvars_server_notembedded,32bit.result 2024-02-15 10:35:52.037016777 +0100 -@@ -44,7 +44,7 @@ +--- a/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result ++++ b/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result +@@ -44,7 +44,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME ARIA_BLOCK_SIZE VARIABLE_SCOPE GLOBAL @@ -9,7 +9,7 @@ VARIABLE_COMMENT Block size to be used for Aria index pages NUMERIC_MIN_VALUE 4096 NUMERIC_MAX_VALUE 32768 -@@ -54,7 +54,7 @@ +@@ -54,7 +54,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME ARIA_CHECKPOINT_INTERVAL VARIABLE_SCOPE GLOBAL @@ -18,7 +18,7 @@ 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 @@ +@@ -64,7 +64,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME ARIA_CHECKPOINT_LOG_ACTIVITY VARIABLE_SCOPE GLOBAL @@ -27,7 +27,7 @@ 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 @@ +@@ -84,7 +84,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME ARIA_FORCE_START_AFTER_RECOVERY_FAILURES VARIABLE_SCOPE GLOBAL @@ -36,7 +36,7 @@ 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 @@ +@@ -104,7 +104,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME ARIA_GROUP_COMMIT_INTERVAL VARIABLE_SCOPE GLOBAL @@ -45,7 +45,7 @@ VARIABLE_COMMENT Interval between commits in microseconds (1/1000000 sec). 0 stands for no waiting for other threads to come and do a commit in "hard" mode and no sync()/commit at all in "soft" mode. Option has only an effect if aria_group_commit is used NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 -@@ -124,7 +124,7 @@ +@@ -124,7 +124,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME ARIA_LOG_FILE_SIZE VARIABLE_SCOPE GLOBAL @@ -54,7 +54,7 @@ VARIABLE_COMMENT Limit for transaction log size NUMERIC_MIN_VALUE 8388608 NUMERIC_MAX_VALUE 4294967295 -@@ -154,10 +154,10 @@ +@@ -154,10 +154,10 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME ARIA_PAGECACHE_AGE_THRESHOLD VARIABLE_SCOPE GLOBAL @@ -67,7 +67,7 @@ NUMERIC_BLOCK_SIZE 100 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -174,7 +174,7 @@ +@@ -174,7 +174,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME ARIA_PAGECACHE_DIVISION_LIMIT VARIABLE_SCOPE GLOBAL @@ -76,7 +76,7 @@ VARIABLE_COMMENT The minimum percentage of warm blocks in key cache NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 100 -@@ -184,7 +184,7 @@ +@@ -184,7 +184,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME ARIA_PAGECACHE_FILE_HASH_SIZE VARIABLE_SCOPE GLOBAL @@ -85,7 +85,7 @@ 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 @@ +@@ -214,7 +214,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME ARIA_REPAIR_THREADS VARIABLE_SCOPE SESSION @@ -94,7 +94,7 @@ 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 @@ +@@ -227,7 +227,7 @@ 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 NUMERIC_MIN_VALUE 16376 @@ -103,7 +103,7 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -284,7 +284,7 @@ +@@ -284,7 +284,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME AUTO_INCREMENT_INCREMENT VARIABLE_SCOPE SESSION @@ -112,7 +112,7 @@ VARIABLE_COMMENT Auto-increment columns are incremented by this NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 65535 -@@ -294,7 +294,7 @@ +@@ -294,7 +294,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME AUTO_INCREMENT_OFFSET VARIABLE_SCOPE SESSION @@ -121,16 +121,16 @@ VARIABLE_COMMENT Offset added to Auto-increment columns. Used when auto-increment-increment != 1 NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 65535 -@@ -304,7 +304,7 @@ +@@ -304,7 +304,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME BACK_LOG VARIABLE_SCOPE GLOBAL -VARIABLE_TYPE BIGINT UNSIGNED +VARIABLE_TYPE INT UNSIGNED - VARIABLE_COMMENT The number of outstanding connection requests MariaDB can have. This comes into play when the main MariaDB thread gets very many connection requests in a very short time + VARIABLE_COMMENT The number of outstanding connection requests MariaDB can have. This comes into play when the main MariaDB thread gets many connection requests in a very short time NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 65535 -@@ -367,7 +367,7 @@ +@@ -367,7 +367,7 @@ VARIABLE_SCOPE GLOBAL VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT The size of the transactional cache for updates to transactional engines for the binary log. If you often use transactions containing many statements, you can increase this to get more performance NUMERIC_MIN_VALUE 4096 @@ -139,7 +139,7 @@ NUMERIC_BLOCK_SIZE 4096 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -384,20 +384,20 @@ +@@ -384,20 +384,20 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME BINLOG_COMMIT_WAIT_COUNT VARIABLE_SCOPE GLOBAL @@ -164,7 +164,7 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -424,7 +424,7 @@ +@@ -424,7 +424,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT NULL VARIABLE_NAME BINLOG_EXPIRE_LOGS_SECONDS VARIABLE_SCOPE GLOBAL @@ -173,7 +173,7 @@ 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 @@ +@@ -437,7 +437,7 @@ VARIABLE_SCOPE GLOBAL VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT The size of file cache for the binary log NUMERIC_MIN_VALUE 8192 @@ -182,7 +182,7 @@ NUMERIC_BLOCK_SIZE 4096 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -514,7 +514,7 @@ +@@ -514,7 +514,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME BINLOG_ROW_EVENT_MAX_SIZE VARIABLE_SCOPE GLOBAL @@ -191,7 +191,7 @@ 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 @@ +@@ -557,7 +557,7 @@ VARIABLE_SCOPE GLOBAL 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 NUMERIC_MIN_VALUE 4096 @@ -200,25 +200,25 @@ NUMERIC_BLOCK_SIZE 4096 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -577,7 +577,7 @@ +@@ -577,7 +577,7 @@ VARIABLE_SCOPE SESSION VARIABLE_TYPE BIGINT UNSIGNED - VARIABLE_COMMENT Size of tree cache used in bulk insert optimisation. Note that this is a limit per thread! + VARIABLE_COMMENT Size of tree cache used in bulk insert optimization. Note that this is a limit per thread NUMERIC_MIN_VALUE 0 -NUMERIC_MAX_VALUE 18446744073709551615 +NUMERIC_MAX_VALUE 4294967295 NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -774,7 +774,7 @@ +@@ -774,7 +774,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME CONNECT_TIMEOUT VARIABLE_SCOPE GLOBAL -VARIABLE_TYPE BIGINT UNSIGNED +VARIABLE_TYPE INT UNSIGNED - VARIABLE_COMMENT The number of seconds the mysqld server is waiting for a connect packet before responding with 'Bad handshake' + VARIABLE_COMMENT The number of seconds the MariaDB server is waiting for a connect packet before responding with 'Bad handshake' NUMERIC_MIN_VALUE 2 NUMERIC_MAX_VALUE 31536000 -@@ -804,7 +804,7 @@ +@@ -804,7 +804,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME DEADLOCK_SEARCH_DEPTH_LONG VARIABLE_SCOPE SESSION @@ -227,7 +227,7 @@ VARIABLE_COMMENT Long search depth for the two-step deadlock detection NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 33 -@@ -814,7 +814,7 @@ +@@ -814,7 +814,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME DEADLOCK_SEARCH_DEPTH_SHORT VARIABLE_SCOPE SESSION @@ -236,7 +236,7 @@ VARIABLE_COMMENT Short search depth for the two-step deadlock detection NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 32 -@@ -824,7 +824,7 @@ +@@ -824,7 +824,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME DEADLOCK_TIMEOUT_LONG VARIABLE_SCOPE SESSION @@ -245,7 +245,7 @@ VARIABLE_COMMENT Long timeout for the two-step deadlock detection (in microseconds) NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 -@@ -834,7 +834,7 @@ +@@ -834,7 +834,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME DEADLOCK_TIMEOUT_SHORT VARIABLE_SCOPE SESSION @@ -254,7 +254,7 @@ VARIABLE_COMMENT Short timeout for the two-step deadlock detection (in microseconds) NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 -@@ -894,7 +894,7 @@ +@@ -894,7 +894,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT NULL VARIABLE_NAME DEFAULT_WEEK_FORMAT VARIABLE_SCOPE SESSION @@ -263,7 +263,7 @@ VARIABLE_COMMENT The default week format used by WEEK() functions NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 7 -@@ -904,7 +904,7 @@ +@@ -904,7 +904,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME DELAYED_INSERT_LIMIT VARIABLE_SCOPE GLOBAL @@ -272,7 +272,7 @@ 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 @@ +@@ -914,7 +914,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME DELAYED_INSERT_TIMEOUT VARIABLE_SCOPE GLOBAL @@ -281,7 +281,7 @@ VARIABLE_COMMENT How long a INSERT DELAYED thread should wait for INSERT statements before terminating NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 31536000 -@@ -924,7 +924,7 @@ +@@ -924,7 +924,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME DELAYED_QUEUE_SIZE VARIABLE_SCOPE GLOBAL @@ -290,7 +290,7 @@ VARIABLE_COMMENT What size queue (in rows) should be allocated for handling INSERT DELAYED. If the queue becomes full, any client that does INSERT DELAYED will wait until there is room in the queue again NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 4294967295 -@@ -954,7 +954,7 @@ +@@ -954,7 +954,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME DIV_PRECISION_INCREMENT VARIABLE_SCOPE SESSION @@ -299,7 +299,7 @@ VARIABLE_COMMENT Precision of the result of '/' operator will be increased on that value NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 38 -@@ -1074,7 +1074,7 @@ +@@ -1074,7 +1074,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT NULL VARIABLE_NAME EXTRA_MAX_CONNECTIONS VARIABLE_SCOPE GLOBAL @@ -308,7 +308,7 @@ VARIABLE_COMMENT The number of connections on extra-port NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 100000 -@@ -1104,7 +1104,7 @@ +@@ -1104,7 +1104,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME FLUSH_TIME VARIABLE_SCOPE GLOBAL @@ -317,7 +317,7 @@ VARIABLE_COMMENT A dedicated thread is created to flush all tables at the given interval NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 31536000 -@@ -1134,7 +1134,7 @@ +@@ -1134,7 +1134,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME FT_MAX_WORD_LEN VARIABLE_SCOPE GLOBAL @@ -326,7 +326,7 @@ VARIABLE_COMMENT The maximum length of the word to be included in a FULLTEXT index. Note: FULLTEXT indexes must be rebuilt after changing this variable NUMERIC_MIN_VALUE 10 NUMERIC_MAX_VALUE 84 -@@ -1144,7 +1144,7 @@ +@@ -1144,7 +1144,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME FT_MIN_WORD_LEN VARIABLE_SCOPE GLOBAL @@ -335,7 +335,7 @@ VARIABLE_COMMENT The minimum length of the word to be included in a FULLTEXT index. Note: FULLTEXT indexes must be rebuilt after changing this variable NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 84 -@@ -1154,7 +1154,7 @@ +@@ -1154,7 +1154,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME FT_QUERY_EXPANSION_LIMIT VARIABLE_SCOPE GLOBAL @@ -344,7 +344,7 @@ VARIABLE_COMMENT Number of best matches to use for query expansion NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 1000 -@@ -1404,7 +1404,7 @@ +@@ -1404,7 +1404,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT NULL VARIABLE_NAME HISTOGRAM_SIZE VARIABLE_SCOPE SESSION @@ -353,7 +353,7 @@ 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 @@ +@@ -1434,7 +1434,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT NULL VARIABLE_NAME HOST_CACHE_SIZE VARIABLE_SCOPE GLOBAL @@ -362,7 +362,7 @@ VARIABLE_COMMENT How many host names should be cached to avoid resolving NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 65536 -@@ -1544,7 +1544,7 @@ +@@ -1544,7 +1544,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT NULL VARIABLE_NAME INTERACTIVE_TIMEOUT VARIABLE_SCOPE SESSION @@ -371,7 +371,7 @@ VARIABLE_COMMENT The number of seconds the server waits for activity on an interactive connection before closing it NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 31536000 -@@ -1577,7 +1577,7 @@ +@@ -1577,7 +1577,7 @@ VARIABLE_SCOPE SESSION VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT The size of the buffer that is used for joins NUMERIC_MIN_VALUE 128 @@ -380,7 +380,7 @@ NUMERIC_BLOCK_SIZE 128 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -1594,7 +1594,7 @@ +@@ -1594,7 +1594,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME JOIN_CACHE_LEVEL VARIABLE_SCOPE SESSION @@ -389,16 +389,16 @@ VARIABLE_COMMENT Controls what join operations can be executed with join buffers. Odd numbers are used for plain join buffers while even numbers are used for linked buffers NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 8 -@@ -1617,7 +1617,7 @@ +@@ -1617,7 +1617,7 @@ VARIABLE_SCOPE GLOBAL VARIABLE_TYPE BIGINT UNSIGNED - VARIABLE_COMMENT The size of the buffer used for index blocks for MyISAM 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 MyISAM tables. Increase this to get faster index handling NUMERIC_MIN_VALUE 0 -NUMERIC_MAX_VALUE 18446744073709551615 +NUMERIC_MAX_VALUE 4294967295 NUMERIC_BLOCK_SIZE 4096 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -1784,7 +1784,7 @@ +@@ -1784,7 +1784,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT NULL VARIABLE_NAME LOCK_WAIT_TIMEOUT VARIABLE_SCOPE SESSION @@ -407,7 +407,7 @@ 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 @@ +@@ -1934,7 +1934,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME LOG_SLOW_MAX_WARNINGS VARIABLE_SCOPE SESSION @@ -416,7 +416,7 @@ VARIABLE_COMMENT Max numbers of warnings printed to slow query log per statement NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 1000 -@@ -1944,7 +1944,7 @@ +@@ -1944,7 +1944,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME LOG_SLOW_MIN_EXAMINED_ROW_LIMIT VARIABLE_SCOPE SESSION @@ -425,7 +425,7 @@ VARIABLE_COMMENT Don't write queries to slow log that examine fewer rows than that NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 -@@ -1984,7 +1984,7 @@ +@@ -1984,7 +1984,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME LOG_SLOW_RATE_LIMIT VARIABLE_SCOPE SESSION @@ -434,16 +434,16 @@ VARIABLE_COMMENT Write to slow log every #th slow query. Set to 1 to log everything. Increase it to reduce the size of the slow or the performance impact of slow logging NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 4294967295 -@@ -2014,7 +2014,7 @@ +@@ -2014,7 +2014,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME LOG_WARNINGS VARIABLE_SCOPE SESSION -VARIABLE_TYPE BIGINT UNSIGNED +VARIABLE_TYPE INT UNSIGNED - VARIABLE_COMMENT Log some non critical warnings to the error log.Value can be between 0 and 11. Higher values mean more verbosity + VARIABLE_COMMENT Log some non-critical warnings to the error log. Value can be between 0 and 11. Higher values mean more verbosity NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 -@@ -2074,7 +2074,7 @@ +@@ -2074,7 +2074,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME MAX_ALLOWED_PACKET VARIABLE_SCOPE SESSION @@ -452,7 +452,7 @@ VARIABLE_COMMENT Max packet length to send to or receive from the server NUMERIC_MIN_VALUE 1024 NUMERIC_MAX_VALUE 1073741824 -@@ -2087,14 +2087,14 @@ +@@ -2087,14 +2087,14 @@ VARIABLE_SCOPE GLOBAL VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT Sets the total size of the transactional cache NUMERIC_MIN_VALUE 4096 @@ -469,7 +469,7 @@ 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 @@ +@@ -2107,7 +2107,7 @@ VARIABLE_SCOPE GLOBAL VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT Sets the total size of the statement cache NUMERIC_MIN_VALUE 4096 @@ -478,7 +478,7 @@ NUMERIC_BLOCK_SIZE 4096 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -2124,7 +2124,7 @@ +@@ -2124,7 +2124,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME MAX_CONNECTIONS VARIABLE_SCOPE GLOBAL @@ -487,7 +487,7 @@ VARIABLE_COMMENT The number of simultaneous clients allowed NUMERIC_MIN_VALUE 10 NUMERIC_MAX_VALUE 100000 -@@ -2134,7 +2134,7 @@ +@@ -2134,7 +2134,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME MAX_CONNECT_ERRORS VARIABLE_SCOPE GLOBAL @@ -496,7 +496,7 @@ VARIABLE_COMMENT If there is more than this number of interrupted connections from a host this host will be blocked from further connections NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 4294967295 -@@ -2144,7 +2144,7 @@ +@@ -2144,7 +2144,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME MAX_DELAYED_THREADS VARIABLE_SCOPE SESSION @@ -505,7 +505,7 @@ VARIABLE_COMMENT Don't start more than this number of threads to handle INSERT DELAYED statements. If set to zero INSERT DELAYED will be not used NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 16384 -@@ -2164,7 +2164,7 @@ +@@ -2164,7 +2164,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME MAX_ERROR_COUNT VARIABLE_SCOPE SESSION @@ -514,7 +514,7 @@ VARIABLE_COMMENT Max number of errors/warnings to store for a statement NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 65535 -@@ -2177,14 +2177,14 @@ +@@ -2177,14 +2177,14 @@ VARIABLE_SCOPE SESSION VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT Don't allow creation of heap tables bigger than this NUMERIC_MIN_VALUE 16384 @@ -531,7 +531,7 @@ VARIABLE_COMMENT Alias for max_delayed_threads. Don't start more than this number of threads to handle INSERT DELAYED statements. If set to zero INSERT DELAYED will be not used NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 16384 -@@ -2204,7 +2204,7 @@ +@@ -2204,7 +2204,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME MAX_LENGTH_FOR_SORT_DATA VARIABLE_SCOPE SESSION @@ -540,7 +540,7 @@ VARIABLE_COMMENT Max number of bytes in sorted records NUMERIC_MIN_VALUE 4 NUMERIC_MAX_VALUE 8388608 -@@ -2234,7 +2234,7 @@ +@@ -2234,7 +2234,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME MAX_RECURSIVE_ITERATIONS VARIABLE_SCOPE SESSION @@ -549,7 +549,7 @@ VARIABLE_COMMENT Maximum number of iterations when executing recursive queries NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 -@@ -2257,14 +2257,14 @@ +@@ -2257,14 +2257,14 @@ VARIABLE_SCOPE SESSION VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT The maximum size of the container of a rowid filter NUMERIC_MIN_VALUE 1024 @@ -566,7 +566,7 @@ VARIABLE_COMMENT Limit assumed max number of seeks when looking up rows based on a key NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 4294967295 -@@ -2284,7 +2284,7 @@ +@@ -2284,7 +2284,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME MAX_SORT_LENGTH VARIABLE_SCOPE SESSION @@ -575,7 +575,7 @@ VARIABLE_COMMENT The number of bytes to use when sorting BLOB or TEXT values (only the first max_sort_length bytes of each value are used; the rest are ignored) NUMERIC_MIN_VALUE 64 NUMERIC_MAX_VALUE 8388608 -@@ -2294,7 +2294,7 @@ +@@ -2294,7 +2294,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME MAX_SP_RECURSION_DEPTH VARIABLE_SCOPE SESSION @@ -584,7 +584,7 @@ VARIABLE_COMMENT Maximum stored procedure recursion depth NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 255 -@@ -2324,7 +2324,7 @@ +@@ -2324,7 +2324,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME MAX_WRITE_LOCK_COUNT VARIABLE_SCOPE GLOBAL @@ -593,7 +593,7 @@ VARIABLE_COMMENT After this many write locks, allow some read locks to run in between NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 4294967295 -@@ -2334,7 +2334,7 @@ +@@ -2334,7 +2334,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME METADATA_LOCKS_CACHE_SIZE VARIABLE_SCOPE GLOBAL @@ -602,7 +602,7 @@ VARIABLE_COMMENT Unused NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 1048576 -@@ -2344,7 +2344,7 @@ +@@ -2344,7 +2344,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME METADATA_LOCKS_HASH_INSTANCES VARIABLE_SCOPE GLOBAL @@ -611,7 +611,7 @@ VARIABLE_COMMENT Unused NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 1024 -@@ -2354,7 +2354,7 @@ +@@ -2354,7 +2354,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME MIN_EXAMINED_ROW_LIMIT VARIABLE_SCOPE SESSION @@ -620,7 +620,7 @@ VARIABLE_COMMENT Alias for log_slow_min_examined_row_limit. Don't write queries to slow log that examine fewer rows than that NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 -@@ -2364,7 +2364,7 @@ +@@ -2364,7 +2364,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME MRR_BUFFER_SIZE VARIABLE_SCOPE SESSION @@ -629,7 +629,7 @@ VARIABLE_COMMENT Size of buffer to use when using MRR with range access NUMERIC_MIN_VALUE 8192 NUMERIC_MAX_VALUE 2147483647 -@@ -2374,7 +2374,7 @@ +@@ -2374,7 +2374,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME MYISAM_BLOCK_SIZE VARIABLE_SCOPE GLOBAL @@ -638,7 +638,7 @@ VARIABLE_COMMENT Block size to be used for MyISAM index pages NUMERIC_MIN_VALUE 1024 NUMERIC_MAX_VALUE 16384 -@@ -2384,7 +2384,7 @@ +@@ -2384,7 +2384,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME MYISAM_DATA_POINTER_SIZE VARIABLE_SCOPE GLOBAL @@ -647,16 +647,16 @@ VARIABLE_COMMENT Default pointer size to be used for MyISAM tables NUMERIC_MIN_VALUE 2 NUMERIC_MAX_VALUE 7 -@@ -2407,7 +2407,7 @@ +@@ -2407,7 +2407,7 @@ VARIABLE_SCOPE GLOBAL VARIABLE_TYPE BIGINT UNSIGNED - VARIABLE_COMMENT Restricts the total memory used for memory mapping of MySQL tables + VARIABLE_COMMENT Restricts the total memory used for memory mapping of MyISAM tables NUMERIC_MIN_VALUE 7 -NUMERIC_MAX_VALUE 18446744073709551615 +NUMERIC_MAX_VALUE 4294967295 NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY YES -@@ -2424,10 +2424,10 @@ +@@ -2424,10 +2424,10 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME MYISAM_REPAIR_THREADS VARIABLE_SCOPE SESSION @@ -669,7 +669,7 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -2437,7 +2437,7 @@ +@@ -2437,7 +2437,7 @@ 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 NUMERIC_MIN_VALUE 4096 @@ -678,7 +678,7 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -2474,7 +2474,7 @@ +@@ -2474,7 +2474,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME NET_BUFFER_LENGTH VARIABLE_SCOPE SESSION @@ -687,7 +687,7 @@ VARIABLE_COMMENT Buffer length for TCP/IP and socket communication NUMERIC_MIN_VALUE 1024 NUMERIC_MAX_VALUE 1048576 -@@ -2484,7 +2484,7 @@ +@@ -2484,7 +2484,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME NET_READ_TIMEOUT VARIABLE_SCOPE SESSION @@ -696,7 +696,7 @@ VARIABLE_COMMENT Number of seconds to wait for more data from a connection before aborting the read NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 31536000 -@@ -2494,7 +2494,7 @@ +@@ -2494,7 +2494,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME NET_RETRY_COUNT VARIABLE_SCOPE SESSION @@ -705,7 +705,7 @@ VARIABLE_COMMENT If a read on a communication port is interrupted, retry this many times before giving up NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 4294967295 -@@ -2504,7 +2504,7 @@ +@@ -2504,7 +2504,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME NET_WRITE_TIMEOUT VARIABLE_SCOPE SESSION @@ -714,16 +714,16 @@ VARIABLE_COMMENT Number of seconds to wait for a block to be written to a connection before aborting the write NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 31536000 -@@ -2554,7 +2554,7 @@ +@@ -2554,7 +2554,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME OPEN_FILES_LIMIT VARIABLE_SCOPE GLOBAL -VARIABLE_TYPE BIGINT UNSIGNED +VARIABLE_TYPE INT UNSIGNED - VARIABLE_COMMENT If this is not 0, then mysqld will use this value to reserve file descriptors to use with setrlimit(). If this value is 0 or autoset then mysqld will reserve max_connections*5 or max_connections + table_cache*2 (whichever is larger) number of file descriptors + VARIABLE_COMMENT If this is not 0, then mariadbd will use this value to reserve file descriptors to use with setrlimit(). If this value is 0 or autoset then mariadbd will reserve max_connections*5 or max_connections + table_cache*2 (whichever is larger) number of file descriptors NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 -@@ -2564,7 +2564,7 @@ +@@ -2564,7 +2564,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME OPTIMIZER_ADJUST_SECONDARY_KEY_COSTS VARIABLE_SCOPE SESSION @@ -732,7 +732,7 @@ VARIABLE_COMMENT Unused NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 2 -@@ -2594,7 +2594,7 @@ +@@ -2594,7 +2594,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME OPTIMIZER_EXTRA_PRUNING_DEPTH VARIABLE_SCOPE SESSION @@ -741,7 +741,7 @@ 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 @@ +@@ -2654,7 +2654,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME OPTIMIZER_MAX_SEL_ARGS VARIABLE_SCOPE SESSION @@ -750,7 +750,7 @@ 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 @@ +@@ -2664,7 +2664,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME OPTIMIZER_MAX_SEL_ARG_WEIGHT VARIABLE_SCOPE SESSION @@ -759,7 +759,7 @@ VARIABLE_COMMENT The maximum weight of the SEL_ARG graph. Set to 0 for no limit NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 -@@ -2674,7 +2674,7 @@ +@@ -2674,7 +2674,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME OPTIMIZER_PRUNE_LEVEL VARIABLE_SCOPE SESSION @@ -768,7 +768,7 @@ VARIABLE_COMMENT Controls the heuristic(s) applied during query optimization to prune less-promising partial plans from the optimizer search space. Meaning: 0 - do not apply any heuristic, thus perform exhaustive search: 1 - prune plans based on cost and number of retrieved rows eq_ref: 2 - prune also if we find an eq_ref chain NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 2 -@@ -2744,7 +2744,7 @@ +@@ -2744,7 +2744,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME OPTIMIZER_SEARCH_DEPTH VARIABLE_SCOPE SESSION @@ -777,7 +777,7 @@ 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 @@ +@@ -2754,7 +2754,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME OPTIMIZER_SELECTIVITY_SAMPLING_LIMIT VARIABLE_SCOPE SESSION @@ -786,7 +786,7 @@ VARIABLE_COMMENT Controls number of record samples to check condition selectivity NUMERIC_MIN_VALUE 10 NUMERIC_MAX_VALUE 4294967295 -@@ -2784,17 +2784,17 @@ +@@ -2784,17 +2784,17 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME OPTIMIZER_TRACE_MAX_MEM_SIZE VARIABLE_SCOPE SESSION @@ -804,10 +804,10 @@ VARIABLE_SCOPE SESSION -VARIABLE_TYPE BIGINT UNSIGNED +VARIABLE_TYPE INT UNSIGNED - VARIABLE_COMMENT Controls selectivity of which conditions the optimizer takes into account to calculate cardinality of a partial join when it searches for the best execution plan Meaning: 1 - use selectivity of index backed range conditions to calculate the cardinality of a partial join if the last joined table is accessed by full table scan or an index scan, 2 - use selectivity of index backed range conditions to calculate the cardinality of a partial join in any case, 3 - additionally always use selectivity of range conditions that are not backed by any index to calculate the cardinality of a partial join, 4 - use histograms to calculate selectivity of range conditions that are not backed by any index to calculate the cardinality of a partial join.5 - additionally use selectivity of certain non-range predicates calculated on record samples + VARIABLE_COMMENT Controls selectivity of which conditions the optimizer takes into account to calculate cardinality of a partial join when it searches for the best execution plan Meaning: 1 - use selectivity of index backed range conditions to calculate the cardinality of a partial join if the last joined table is accessed by full table scan or an index scan, 2 - use selectivity of index backed range conditions to calculate the cardinality of a partial join in any case, 3 - additionally always use selectivity of range conditions that are not backed by any index to calculate the cardinality of a partial join, 4 - use histograms to calculate selectivity of range conditions that are not backed by any index to calculate the cardinality of a partial join. 5 - additionally use selectivity of certain non-range predicates calculated on record samples NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 5 -@@ -2824,7 +2824,7 @@ +@@ -2824,7 +2824,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME PERFORMANCE_SCHEMA_ACCOUNTS_SIZE VARIABLE_SCOPE GLOBAL @@ -816,7 +816,7 @@ 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 @@ +@@ -2834,7 +2834,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_DIGESTS_SIZE VARIABLE_SCOPE GLOBAL @@ -825,7 +825,7 @@ 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 @@ +@@ -2844,7 +2844,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_EVENTS_STAGES_HISTORY_LONG_SIZE VARIABLE_SCOPE GLOBAL @@ -834,7 +834,7 @@ 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 @@ +@@ -2854,7 +2854,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_EVENTS_STAGES_HISTORY_SIZE VARIABLE_SCOPE GLOBAL @@ -843,7 +843,7 @@ 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 @@ +@@ -2864,7 +2864,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_EVENTS_STATEMENTS_HISTORY_LONG_SIZE VARIABLE_SCOPE GLOBAL @@ -852,7 +852,7 @@ 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 @@ +@@ -2874,7 +2874,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_EVENTS_STATEMENTS_HISTORY_SIZE VARIABLE_SCOPE GLOBAL @@ -861,7 +861,7 @@ 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 @@ +@@ -2884,7 +2884,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_EVENTS_TRANSACTIONS_HISTORY_LONG_SIZE VARIABLE_SCOPE GLOBAL @@ -870,7 +870,7 @@ 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 @@ +@@ -2894,7 +2894,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_EVENTS_TRANSACTIONS_HISTORY_SIZE VARIABLE_SCOPE GLOBAL @@ -879,7 +879,7 @@ 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 @@ +@@ -2904,7 +2904,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_EVENTS_WAITS_HISTORY_LONG_SIZE VARIABLE_SCOPE GLOBAL @@ -888,7 +888,7 @@ 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 @@ +@@ -2914,7 +2914,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_EVENTS_WAITS_HISTORY_SIZE VARIABLE_SCOPE GLOBAL @@ -897,7 +897,7 @@ 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 @@ +@@ -2924,7 +2924,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_HOSTS_SIZE VARIABLE_SCOPE GLOBAL @@ -906,7 +906,7 @@ 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 @@ +@@ -2934,7 +2934,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_COND_CLASSES VARIABLE_SCOPE GLOBAL @@ -915,7 +915,7 @@ VARIABLE_COMMENT Maximum number of condition instruments NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 256 -@@ -2944,7 +2944,7 @@ +@@ -2944,7 +2944,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_COND_INSTANCES VARIABLE_SCOPE GLOBAL @@ -924,7 +924,7 @@ 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 @@ +@@ -2954,7 +2954,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_DIGEST_LENGTH VARIABLE_SCOPE GLOBAL @@ -933,7 +933,7 @@ 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 @@ +@@ -2964,7 +2964,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_FILE_CLASSES VARIABLE_SCOPE GLOBAL @@ -942,7 +942,7 @@ VARIABLE_COMMENT Maximum number of file instruments NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 256 -@@ -2974,7 +2974,7 @@ +@@ -2974,7 +2974,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_FILE_HANDLES VARIABLE_SCOPE GLOBAL @@ -951,7 +951,7 @@ VARIABLE_COMMENT Maximum number of opened instrumented files NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 1048576 -@@ -2984,7 +2984,7 @@ +@@ -2984,7 +2984,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_FILE_INSTANCES VARIABLE_SCOPE GLOBAL @@ -960,7 +960,7 @@ 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 @@ +@@ -2994,7 +2994,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_INDEX_STAT VARIABLE_SCOPE GLOBAL @@ -969,7 +969,7 @@ 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 @@ +@@ -3004,7 +3004,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_MEMORY_CLASSES VARIABLE_SCOPE GLOBAL @@ -978,7 +978,7 @@ VARIABLE_COMMENT Maximum number of memory pool instruments NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 1024 -@@ -3014,7 +3014,7 @@ +@@ -3014,7 +3014,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_METADATA_LOCKS VARIABLE_SCOPE GLOBAL @@ -987,7 +987,7 @@ 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 @@ +@@ -3024,7 +3024,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_MUTEX_CLASSES VARIABLE_SCOPE GLOBAL @@ -996,7 +996,7 @@ VARIABLE_COMMENT Maximum number of mutex instruments NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 256 -@@ -3034,7 +3034,7 @@ +@@ -3034,7 +3034,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_MUTEX_INSTANCES VARIABLE_SCOPE GLOBAL @@ -1005,7 +1005,7 @@ 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 @@ +@@ -3044,7 +3044,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_PREPARED_STATEMENTS_INSTANCES VARIABLE_SCOPE GLOBAL @@ -1014,7 +1014,7 @@ 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 @@ +@@ -3054,7 +3054,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_PROGRAM_INSTANCES VARIABLE_SCOPE GLOBAL @@ -1023,7 +1023,7 @@ 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 @@ +@@ -3064,7 +3064,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_RWLOCK_CLASSES VARIABLE_SCOPE GLOBAL @@ -1032,7 +1032,7 @@ VARIABLE_COMMENT Maximum number of rwlock instruments NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 256 -@@ -3074,7 +3074,7 @@ +@@ -3074,7 +3074,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_RWLOCK_INSTANCES VARIABLE_SCOPE GLOBAL @@ -1041,7 +1041,7 @@ 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 @@ +@@ -3084,7 +3084,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_SOCKET_CLASSES VARIABLE_SCOPE GLOBAL @@ -1050,7 +1050,7 @@ VARIABLE_COMMENT Maximum number of socket instruments NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 256 -@@ -3094,7 +3094,7 @@ +@@ -3094,7 +3094,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_SOCKET_INSTANCES VARIABLE_SCOPE GLOBAL @@ -1059,7 +1059,7 @@ 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 @@ +@@ -3104,7 +3104,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_SQL_TEXT_LENGTH VARIABLE_SCOPE GLOBAL @@ -1068,7 +1068,7 @@ VARIABLE_COMMENT Maximum length of displayed sql text NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 1048576 -@@ -3114,7 +3114,7 @@ +@@ -3114,7 +3114,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_STAGE_CLASSES VARIABLE_SCOPE GLOBAL @@ -1077,7 +1077,7 @@ VARIABLE_COMMENT Maximum number of stage instruments NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 256 -@@ -3124,7 +3124,7 @@ +@@ -3124,7 +3124,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_STATEMENT_CLASSES VARIABLE_SCOPE GLOBAL @@ -1086,7 +1086,7 @@ VARIABLE_COMMENT Maximum number of statement instruments NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 256 -@@ -3134,7 +3134,7 @@ +@@ -3134,7 +3134,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_STATEMENT_STACK VARIABLE_SCOPE GLOBAL @@ -1095,7 +1095,7 @@ VARIABLE_COMMENT Number of rows per thread in EVENTS_STATEMENTS_CURRENT NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 256 -@@ -3144,7 +3144,7 @@ +@@ -3144,7 +3144,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_TABLE_HANDLES VARIABLE_SCOPE GLOBAL @@ -1104,7 +1104,7 @@ 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 @@ +@@ -3154,7 +3154,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_TABLE_INSTANCES VARIABLE_SCOPE GLOBAL @@ -1113,7 +1113,7 @@ 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 @@ +@@ -3164,7 +3164,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_TABLE_LOCK_STAT VARIABLE_SCOPE GLOBAL @@ -1122,7 +1122,7 @@ 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 @@ +@@ -3174,7 +3174,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_THREAD_CLASSES VARIABLE_SCOPE GLOBAL @@ -1131,7 +1131,7 @@ VARIABLE_COMMENT Maximum number of thread instruments NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 256 -@@ -3184,7 +3184,7 @@ +@@ -3184,7 +3184,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_THREAD_INSTANCES VARIABLE_SCOPE GLOBAL @@ -1140,7 +1140,7 @@ 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 @@ +@@ -3194,7 +3194,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_SESSION_CONNECT_ATTRS_SIZE VARIABLE_SCOPE GLOBAL @@ -1149,7 +1149,7 @@ 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 @@ +@@ -3204,7 +3204,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_SETUP_ACTORS_SIZE VARIABLE_SCOPE GLOBAL @@ -1158,7 +1158,7 @@ VARIABLE_COMMENT Maximum number of rows in SETUP_ACTORS NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1024 -@@ -3214,7 +3214,7 @@ +@@ -3214,7 +3214,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_SETUP_OBJECTS_SIZE VARIABLE_SCOPE GLOBAL @@ -1167,7 +1167,7 @@ VARIABLE_COMMENT Maximum number of rows in SETUP_OBJECTS NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -3224,7 +3224,7 @@ +@@ -3224,7 +3224,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_USERS_SIZE VARIABLE_SCOPE GLOBAL @@ -1176,7 +1176,7 @@ 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 @@ +@@ -3274,7 +3274,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PRELOAD_BUFFER_SIZE VARIABLE_SCOPE SESSION @@ -1185,7 +1185,7 @@ VARIABLE_COMMENT The size of the buffer that is allocated when preloading indexes NUMERIC_MIN_VALUE 1024 NUMERIC_MAX_VALUE 1073741824 -@@ -3294,7 +3294,7 @@ +@@ -3294,7 +3294,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT NULL VARIABLE_NAME PROFILING_HISTORY_SIZE VARIABLE_SCOPE SESSION @@ -1194,7 +1194,7 @@ 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 @@ +@@ -3304,7 +3304,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PROGRESS_REPORT_TIME VARIABLE_SCOPE SESSION @@ -1203,7 +1203,7 @@ 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 @@ +@@ -3364,7 +3364,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT NULL VARIABLE_NAME QUERY_ALLOC_BLOCK_SIZE VARIABLE_SCOPE SESSION @@ -1212,7 +1212,7 @@ VARIABLE_COMMENT Allocation block size for query parsing and execution NUMERIC_MIN_VALUE 1024 NUMERIC_MAX_VALUE 4294967295 -@@ -3374,7 +3374,7 @@ +@@ -3374,7 +3374,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME QUERY_CACHE_LIMIT VARIABLE_SCOPE GLOBAL @@ -1221,7 +1221,7 @@ VARIABLE_COMMENT Don't cache results that are bigger than this NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 -@@ -3384,7 +3384,7 @@ +@@ -3384,7 +3384,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME QUERY_CACHE_MIN_RES_UNIT VARIABLE_SCOPE GLOBAL @@ -1230,7 +1230,7 @@ VARIABLE_COMMENT The minimum size for blocks allocated by the query cache NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 -@@ -3397,7 +3397,7 @@ +@@ -3397,7 +3397,7 @@ VARIABLE_SCOPE GLOBAL VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT The memory allocated to store results from old queries NUMERIC_MIN_VALUE 0 @@ -1239,7 +1239,7 @@ NUMERIC_BLOCK_SIZE 1024 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -3434,7 +3434,7 @@ +@@ -3434,7 +3434,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME QUERY_PREALLOC_SIZE VARIABLE_SCOPE SESSION @@ -1248,7 +1248,7 @@ VARIABLE_COMMENT Persistent buffer for query parsing and execution NUMERIC_MIN_VALUE 1024 NUMERIC_MAX_VALUE 4294967295 -@@ -3447,7 +3447,7 @@ +@@ -3447,7 +3447,7 @@ VARIABLE_SCOPE SESSION ONLY VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT Sets the internal state of the RAND() generator for replication purposes NUMERIC_MIN_VALUE 0 @@ -1257,7 +1257,7 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -3457,14 +3457,14 @@ +@@ -3457,14 +3457,14 @@ VARIABLE_SCOPE SESSION ONLY VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT Sets the internal state of the RAND() generator for replication purposes NUMERIC_MIN_VALUE 0 @@ -1274,7 +1274,7 @@ VARIABLE_COMMENT Allocation block size for storing ranges during optimization NUMERIC_MIN_VALUE 4096 NUMERIC_MAX_VALUE 4294967295 -@@ -3477,14 +3477,14 @@ +@@ -3477,14 +3477,14 @@ VARIABLE_SCOPE GLOBAL VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT Maximum speed(KB/s) to read binlog from master (0 = no limit) NUMERIC_MIN_VALUE 0 @@ -1291,7 +1291,7 @@ VARIABLE_COMMENT Each thread that does a sequential scan allocates a buffer of this size for each table it scans. If you do many sequential scans, you may want to increase this value NUMERIC_MIN_VALUE 8192 NUMERIC_MAX_VALUE 2147483647 -@@ -3504,7 +3504,7 @@ +@@ -3504,7 +3504,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME READ_RND_BUFFER_SIZE VARIABLE_SCOPE SESSION @@ -1300,7 +1300,7 @@ VARIABLE_COMMENT When reading rows in sorted order after a sort, the rows are read through this buffer to avoid a disk seeks NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 2147483647 -@@ -3734,10 +3734,10 @@ +@@ -3734,10 +3734,10 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME ROWID_MERGE_BUFF_SIZE VARIABLE_SCOPE SESSION @@ -1313,7 +1313,7 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -3754,20 +3754,20 @@ +@@ -3754,20 +3754,20 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME RPL_SEMI_SYNC_MASTER_TIMEOUT VARIABLE_SCOPE GLOBAL @@ -1338,7 +1338,7 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -3824,10 +3824,10 @@ +@@ -3824,10 +3824,10 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME RPL_SEMI_SYNC_SLAVE_TRACE_LEVEL VARIABLE_SCOPE GLOBAL @@ -1351,7 +1351,7 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -3864,7 +3864,7 @@ +@@ -3864,7 +3864,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME SERVER_ID VARIABLE_SCOPE SESSION @@ -1360,7 +1360,7 @@ VARIABLE_COMMENT Uniquely identifies the server instance in the community of replication partners NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 4294967295 -@@ -4014,7 +4014,7 @@ +@@ -4014,7 +4014,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME SLAVE_DOMAIN_PARALLEL_THREADS VARIABLE_SCOPE GLOBAL @@ -1369,7 +1369,7 @@ 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 @@ +@@ -4044,7 +4044,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME SLAVE_MAX_ALLOWED_PACKET VARIABLE_SCOPE GLOBAL @@ -1378,7 +1378,7 @@ 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 @@ +@@ -4074,7 +4074,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME SLAVE_PARALLEL_MAX_QUEUED VARIABLE_SCOPE GLOBAL @@ -1387,7 +1387,7 @@ 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 @@ +@@ -4094,7 +4094,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT NULL VARIABLE_NAME SLAVE_PARALLEL_THREADS VARIABLE_SCOPE GLOBAL @@ -1396,7 +1396,7 @@ VARIABLE_COMMENT If non-zero, number of threads to spawn to apply in parallel events on the slave that were group-committed on the master or were logged with GTID in different replication domains. Note that these threads are in addition to the IO and SQL threads, which are always created by a replication slave NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 16383 -@@ -4104,7 +4104,7 @@ +@@ -4104,7 +4104,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME SLAVE_PARALLEL_WORKERS VARIABLE_SCOPE GLOBAL @@ -1405,7 +1405,7 @@ VARIABLE_COMMENT Alias for slave_parallel_threads NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 16383 -@@ -4144,7 +4144,7 @@ +@@ -4144,7 +4144,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME SLAVE_TRANSACTION_RETRIES VARIABLE_SCOPE GLOBAL @@ -1414,7 +1414,7 @@ VARIABLE_COMMENT Number of times the slave SQL thread will retry a transaction in case it failed with a deadlock, elapsed lock wait timeout or listed in slave_transaction_retry_errors, before giving up and stopping NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 -@@ -4164,7 +4164,7 @@ +@@ -4164,7 +4164,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME SLAVE_TRANSACTION_RETRY_INTERVAL VARIABLE_SCOPE GLOBAL @@ -1423,7 +1423,7 @@ VARIABLE_COMMENT Interval of the slave SQL thread will retry a transaction in case it failed with a deadlock or elapsed lock wait timeout or listed in slave_transaction_retry_errors NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 3600 -@@ -4184,7 +4184,7 @@ +@@ -4184,7 +4184,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME SLOW_LAUNCH_TIME VARIABLE_SCOPE GLOBAL @@ -1432,7 +1432,7 @@ VARIABLE_COMMENT If creating the thread takes longer than this value (in seconds), the Slow_launch_threads counter will be incremented NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 31536000 -@@ -4227,7 +4227,7 @@ +@@ -4227,7 +4227,7 @@ VARIABLE_SCOPE SESSION VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT Each thread that needs to do a sort allocates a buffer of this size NUMERIC_MIN_VALUE 1024 @@ -1441,7 +1441,7 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -4454,7 +4454,7 @@ +@@ -4454,7 +4454,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT NULL VARIABLE_NAME STORED_PROGRAM_CACHE VARIABLE_SCOPE GLOBAL @@ -1450,7 +1450,7 @@ 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 @@ +@@ -4564,7 +4564,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME TABLE_DEFINITION_CACHE VARIABLE_SCOPE GLOBAL @@ -1459,7 +1459,7 @@ VARIABLE_COMMENT The number of cached table definitions NUMERIC_MIN_VALUE 400 NUMERIC_MAX_VALUE 2097152 -@@ -4574,7 +4574,7 @@ +@@ -4574,7 +4574,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME TABLE_OPEN_CACHE VARIABLE_SCOPE GLOBAL @@ -1468,7 +1468,7 @@ VARIABLE_COMMENT The number of cached open tables NUMERIC_MIN_VALUE 10 NUMERIC_MAX_VALUE 1048576 -@@ -4634,7 +4634,7 @@ +@@ -4634,7 +4634,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME THREAD_CACHE_SIZE VARIABLE_SCOPE GLOBAL @@ -1477,7 +1477,7 @@ VARIABLE_COMMENT How many threads we should keep in a cache for reuse. These are freed after 5 minutes of idle time NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 16384 -@@ -4797,7 +4797,7 @@ +@@ -4797,7 +4797,7 @@ VARIABLE_SCOPE SESSION VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT Max size for data for an internal temporary on-disk MyISAM or Aria table NUMERIC_MIN_VALUE 1024 @@ -1486,7 +1486,7 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -4807,7 +4807,7 @@ +@@ -4807,7 +4807,7 @@ VARIABLE_SCOPE SESSION 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 NUMERIC_MIN_VALUE 0 @@ -1495,7 +1495,7 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -4817,14 +4817,14 @@ +@@ -4817,14 +4817,14 @@ VARIABLE_SCOPE SESSION 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 NUMERIC_MIN_VALUE 0 @@ -1512,7 +1512,7 @@ VARIABLE_COMMENT Allocation block size for transactions to be stored in binary log NUMERIC_MIN_VALUE 1024 NUMERIC_MAX_VALUE 134217728 -@@ -4844,7 +4844,7 @@ +@@ -4844,7 +4844,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT NULL VARIABLE_NAME TRANSACTION_PREALLOC_SIZE VARIABLE_SCOPE SESSION @@ -1521,7 +1521,7 @@ VARIABLE_COMMENT Persistent buffer for transactions to be stored in binary log NUMERIC_MIN_VALUE 1024 NUMERIC_MAX_VALUE 134217728 -@@ -4994,7 +4994,7 @@ +@@ -4994,7 +4994,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT NULL VARIABLE_NAME WAIT_TIMEOUT VARIABLE_SCOPE SESSION @@ -1530,7 +1530,7 @@ VARIABLE_COMMENT The number of seconds the server waits for activity on a connection before closing it NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 31536000 -@@ -5021,7 +5021,7 @@ +@@ -5021,7 +5021,7 @@ order by variable_name; VARIABLE_NAME LOG_TC_SIZE GLOBAL_VALUE_ORIGIN AUTO VARIABLE_SCOPE GLOBAL diff --git a/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result b/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result index 96574a6e28f..f55011307d4 100644 --- a/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result +++ b/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result @@ -305,7 +305,7 @@ COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME BACK_LOG VARIABLE_SCOPE GLOBAL VARIABLE_TYPE BIGINT UNSIGNED -VARIABLE_COMMENT The number of outstanding connection requests MariaDB can have. This comes into play when the main MariaDB thread gets very many connection requests in a very short time +VARIABLE_COMMENT The number of outstanding connection requests MariaDB can have. This comes into play when the main MariaDB thread gets many connection requests in a very short time NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 65535 NUMERIC_BLOCK_SIZE 1 @@ -445,7 +445,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME BINLOG_FORMAT VARIABLE_SCOPE SESSION VARIABLE_TYPE ENUM -VARIABLE_COMMENT What form of binary logging the master will use: either ROW for row-based binary logging, STATEMENT for statement-based binary logging, or MIXED. MIXED is statement-based binary logging except for those statements where only row-based is correct: those which involve user-defined functions (i.e. UDFs) or the UUID() function; for those, row-based binary logging is automatically used +VARIABLE_COMMENT The binary logging format the master will use: ROW for row-based binary logging (safer), STATEMENT for statement-based binary logging (smaller binary logs), MIXED for statement-based binary logging when it's safe with fall back to row-based otherwise NUMERIC_MIN_VALUE NULL NUMERIC_MAX_VALUE NULL NUMERIC_BLOCK_SIZE NULL @@ -525,7 +525,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME BINLOG_ROW_IMAGE VARIABLE_SCOPE SESSION VARIABLE_TYPE ENUM -VARIABLE_COMMENT Controls whether rows should be logged in 'FULL', 'FULL_NODUP', 'NOBLOB' or 'MINIMAL' formats. 'FULL', means that all columns in the before and after image are logged. 'FULL_NODUP', means that all columns are logged in before image, but only changed columns or all columns of inserted record are logged in after image, 'NOBLOB', means that mysqld avoids logging blob columns whenever possible (eg, blob column was not changed or is not part of primary key). 'MINIMAL', means that a PK equivalent (PK columns or full row if there is no PK in the table) is logged in the before image, and only changed columns are logged in the after image. (Default: FULL) +VARIABLE_COMMENT Controls whether rows should be logged in 'FULL', 'FULL_NODUP', 'NOBLOB' or 'MINIMAL' formats. 'FULL', means that all columns in the before and after image are logged. 'FULL_NODUP', means that all columns are logged in before image, but only changed columns or all columns of inserted record are logged in after image, 'NOBLOB', means that MariaDB avoids logging blob columns whenever possible (eg, blob column was not changed or is not part of primary key). 'MINIMAL', means that a PK equivalent (PK columns or full row if there is no PK in the table) is logged in the before image, and only changed columns are logged in the after image NUMERIC_MIN_VALUE NULL NUMERIC_MAX_VALUE NULL NUMERIC_BLOCK_SIZE NULL @@ -535,7 +535,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME BINLOG_ROW_METADATA VARIABLE_SCOPE GLOBAL VARIABLE_TYPE ENUM -VARIABLE_COMMENT Controls whether metadata is logged using FULL , MINIMAL format and NO_LOG.FULL causes all metadata to be logged; MINIMAL means that only metadata actually required by slave is logged; NO_LOG NO metadata will be logged.Default: NO_LOG +VARIABLE_COMMENT Controls whether metadata is logged using FULL , MINIMAL format and NO_LOG. FULL causes all metadata to be logged; MINIMAL means that only metadata actually required by slave is logged; NO_LOG NO metadata will be logged NUMERIC_MIN_VALUE NULL NUMERIC_MAX_VALUE NULL NUMERIC_BLOCK_SIZE NULL @@ -575,7 +575,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME BULK_INSERT_BUFFER_SIZE VARIABLE_SCOPE SESSION VARIABLE_TYPE BIGINT UNSIGNED -VARIABLE_COMMENT Size of tree cache used in bulk insert optimisation. Note that this is a limit per thread! +VARIABLE_COMMENT Size of tree cache used in bulk insert optimization. Note that this is a limit per thread NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 18446744073709551615 NUMERIC_BLOCK_SIZE 1 @@ -775,7 +775,7 @@ COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME CONNECT_TIMEOUT VARIABLE_SCOPE GLOBAL VARIABLE_TYPE BIGINT UNSIGNED -VARIABLE_COMMENT The number of seconds the mysqld server is waiting for a connect packet before responding with 'Bad handshake' +VARIABLE_COMMENT The number of seconds the MariaDB server is waiting for a connect packet before responding with 'Bad handshake' NUMERIC_MIN_VALUE 2 NUMERIC_MAX_VALUE 31536000 NUMERIC_BLOCK_SIZE 1 @@ -1175,7 +1175,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME GENERAL_LOG VARIABLE_SCOPE GLOBAL VARIABLE_TYPE BOOLEAN -VARIABLE_COMMENT Log connections and queries to a table or log file. Defaults logging to a file 'hostname'.log or a table mysql.general_logif --log-output=TABLE is used +VARIABLE_COMMENT Log connections and queries to a table or log file. Defaults logging to a file 'hostname'.log or a table mysql.general_log if --log-output=TABLE is used NUMERIC_MIN_VALUE NULL NUMERIC_MAX_VALUE NULL NUMERIC_BLOCK_SIZE NULL @@ -1205,7 +1205,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME GTID_BINLOG_POS VARIABLE_SCOPE GLOBAL VARIABLE_TYPE VARCHAR -VARIABLE_COMMENT Last GTID logged to the binary log, per replicationdomain +VARIABLE_COMMENT Last GTID logged to the binary log, per replication domain NUMERIC_MIN_VALUE NULL NUMERIC_MAX_VALUE NULL NUMERIC_BLOCK_SIZE NULL @@ -1265,7 +1265,7 @@ COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME GTID_POS_AUTO_ENGINES VARIABLE_SCOPE GLOBAL VARIABLE_TYPE VARCHAR -VARIABLE_COMMENT List of engines for which to automatically create a mysql.gtid_slave_pos_ENGINE table, if a transaction using that engine is replicated. This can be used to avoid introducing cross-engine transactions, if engines are used different from that used by table mysql.gtid_slave_pos +VARIABLE_COMMENT List of engines for which a dedicated mysql.gtid_slave_pos_ENGINE table is created automatically, if a transaction using that engine is replicated. This helps to avoid cross-engine transactions, as would be the case when user tables and mysql.gtid_slave_pos were created in different transactional engines NUMERIC_MIN_VALUE NULL NUMERIC_MAX_VALUE NULL NUMERIC_BLOCK_SIZE NULL @@ -1385,7 +1385,7 @@ COMMAND_LINE_ARGUMENT NULL VARIABLE_NAME HAVE_SSL VARIABLE_SCOPE GLOBAL VARIABLE_TYPE VARCHAR -VARIABLE_COMMENT If the server supports secure connections, will be set to YES, otherwise will be set to NO. If set to DISABLED, the server was compiled with TLS support, but was not started with TLS support (see the mysqld options). See also have_openssl +VARIABLE_COMMENT If the server supports secure connections, will be set to YES, otherwise will be set to NO. If set to DISABLED, the server was compiled with TLS support, but was not started with TLS support (see the mariadbd options). See also have_openssl NUMERIC_MIN_VALUE NULL NUMERIC_MAX_VALUE NULL NUMERIC_BLOCK_SIZE NULL @@ -1615,7 +1615,7 @@ COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME KEY_BUFFER_SIZE VARIABLE_SCOPE GLOBAL VARIABLE_TYPE BIGINT UNSIGNED -VARIABLE_COMMENT The size of the buffer used for index blocks for MyISAM 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 MyISAM tables. Increase this to get faster index handling NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 18446744073709551615 NUMERIC_BLOCK_SIZE 4096 @@ -1675,7 +1675,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME LARGE_FILES_SUPPORT VARIABLE_SCOPE GLOBAL VARIABLE_TYPE BOOLEAN -VARIABLE_COMMENT Whether mysqld was compiled with options for large file support +VARIABLE_COMMENT Whether mariadbd was compiled with options for large file support NUMERIC_MIN_VALUE NULL NUMERIC_MAX_VALUE NULL NUMERIC_BLOCK_SIZE NULL @@ -1775,7 +1775,7 @@ COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME LOCKED_IN_MEMORY VARIABLE_SCOPE GLOBAL VARIABLE_TYPE BOOLEAN -VARIABLE_COMMENT Whether mysqld was locked in memory with --memlock +VARIABLE_COMMENT Whether mariadbd process was locked in memory with --memlock NUMERIC_MIN_VALUE NULL NUMERIC_MAX_VALUE NULL NUMERIC_BLOCK_SIZE NULL @@ -1825,7 +1825,7 @@ COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME LOG_BIN_COMPRESS_MIN_LEN VARIABLE_SCOPE GLOBAL VARIABLE_TYPE INT UNSIGNED -VARIABLE_COMMENT Minimum length of sql statement(in statement mode) or record(in row mode)that can be compressed +VARIABLE_COMMENT Minimum length of sql statement (in statement mode) or record (in row mode) that can be compressed NUMERIC_MIN_VALUE 10 NUMERIC_MAX_VALUE 1024 NUMERIC_BLOCK_SIZE 1 @@ -1925,7 +1925,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME LOG_SLOW_FILTER VARIABLE_SCOPE SESSION VARIABLE_TYPE SET -VARIABLE_COMMENT Log only certain types of queries to the slow log. If variable empty all kind of queries are logged. All types are bound by slow_query_time, except 'not_using_index' which is always logged if enabled +VARIABLE_COMMENT Log only certain types of queries to the slow log. If variable is empty all kinds of queries are logged. All types are bound by slow_query_time, except 'not_using_index' which is always logged if enabled NUMERIC_MIN_VALUE NULL NUMERIC_MAX_VALUE NULL NUMERIC_BLOCK_SIZE NULL @@ -2015,7 +2015,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME LOG_WARNINGS VARIABLE_SCOPE SESSION VARIABLE_TYPE BIGINT UNSIGNED -VARIABLE_COMMENT Log some non critical warnings to the error log.Value can be between 0 and 11. Higher values mean more verbosity +VARIABLE_COMMENT Log some non-critical warnings to the error log. Value can be between 0 and 11. Higher values mean more verbosity NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 NUMERIC_BLOCK_SIZE 1 @@ -2405,7 +2405,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME MYISAM_MMAP_SIZE VARIABLE_SCOPE GLOBAL VARIABLE_TYPE BIGINT UNSIGNED -VARIABLE_COMMENT Restricts the total memory used for memory mapping of MySQL tables +VARIABLE_COMMENT Restricts the total memory used for memory mapping of MyISAM tables NUMERIC_MIN_VALUE 7 NUMERIC_MAX_VALUE 18446744073709551615 NUMERIC_BLOCK_SIZE 1 @@ -2555,7 +2555,7 @@ COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME OPEN_FILES_LIMIT VARIABLE_SCOPE GLOBAL VARIABLE_TYPE BIGINT UNSIGNED -VARIABLE_COMMENT If this is not 0, then mysqld will use this value to reserve file descriptors to use with setrlimit(). If this value is 0 or autoset then mysqld will reserve max_connections*5 or max_connections + table_cache*2 (whichever is larger) number of file descriptors +VARIABLE_COMMENT If this is not 0, then mariadbd will use this value to reserve file descriptors to use with setrlimit(). If this value is 0 or autoset then mariadbd will reserve max_connections*5 or max_connections + table_cache*2 (whichever is larger) number of file descriptors NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 NUMERIC_BLOCK_SIZE 1 @@ -2605,7 +2605,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME OPTIMIZER_INDEX_BLOCK_COPY_COST VARIABLE_SCOPE GLOBAL VARIABLE_TYPE DOUBLE -VARIABLE_COMMENT Cost of copying a key block from the cache to intern storage as part of an index scan +VARIABLE_COMMENT Cost of copying a key block from the cache to internal storage as part of an index scan NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 1000 NUMERIC_BLOCK_SIZE NULL @@ -2795,7 +2795,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME OPTIMIZER_USE_CONDITION_SELECTIVITY VARIABLE_SCOPE SESSION VARIABLE_TYPE BIGINT UNSIGNED -VARIABLE_COMMENT Controls selectivity of which conditions the optimizer takes into account to calculate cardinality of a partial join when it searches for the best execution plan Meaning: 1 - use selectivity of index backed range conditions to calculate the cardinality of a partial join if the last joined table is accessed by full table scan or an index scan, 2 - use selectivity of index backed range conditions to calculate the cardinality of a partial join in any case, 3 - additionally always use selectivity of range conditions that are not backed by any index to calculate the cardinality of a partial join, 4 - use histograms to calculate selectivity of range conditions that are not backed by any index to calculate the cardinality of a partial join.5 - additionally use selectivity of certain non-range predicates calculated on record samples +VARIABLE_COMMENT Controls selectivity of which conditions the optimizer takes into account to calculate cardinality of a partial join when it searches for the best execution plan Meaning: 1 - use selectivity of index backed range conditions to calculate the cardinality of a partial join if the last joined table is accessed by full table scan or an index scan, 2 - use selectivity of index backed range conditions to calculate the cardinality of a partial join in any case, 3 - additionally always use selectivity of range conditions that are not backed by any index to calculate the cardinality of a partial join, 4 - use histograms to calculate selectivity of range conditions that are not backed by any index to calculate the cardinality of a partial join. 5 - additionally use selectivity of certain non-range predicates calculated on record samples NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 5 NUMERIC_BLOCK_SIZE 1 @@ -3235,7 +3235,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PID_FILE VARIABLE_SCOPE GLOBAL VARIABLE_TYPE VARCHAR -VARIABLE_COMMENT Pid file used by safe_mysqld +VARIABLE_COMMENT Pid file used by mariadbd-safe NUMERIC_MIN_VALUE NULL NUMERIC_MAX_VALUE NULL NUMERIC_BLOCK_SIZE NULL @@ -3325,7 +3325,7 @@ COMMAND_LINE_ARGUMENT NULL VARIABLE_NAME PROXY_PROTOCOL_NETWORKS VARIABLE_SCOPE GLOBAL VARIABLE_TYPE VARCHAR -VARIABLE_COMMENT Enable proxy protocol for these source networks. The syntax is a comma separated list of IPv4 and IPv6 networks. If the network doesn't contain mask, it is considered to be a single host. "*" represents all networks and must the only directive on the line. String "localhost" represents non-TCP local connections (Unix domain socket, Windows named pipe or shared memory) +VARIABLE_COMMENT Enable proxy protocol for these source networks. The syntax is a comma separated list of IPv4 and IPv6 networks. If the network doesn't contain mask, it is considered to be a single host. "*" represents all networks and must be the only directive on the line. String "localhost" represents non-TCP local connections (Unix domain socket, Windows named pipe or shared memory) NUMERIC_MIN_VALUE NULL NUMERIC_MAX_VALUE NULL NUMERIC_BLOCK_SIZE NULL @@ -3655,7 +3655,7 @@ COMMAND_LINE_ARGUMENT NULL VARIABLE_NAME REPLICATE_REWRITE_DB VARIABLE_SCOPE GLOBAL VARIABLE_TYPE VARCHAR -VARIABLE_COMMENT Tells the slave to replicate binlog events into a different database than their original target on the master.Example: replicate-rewrite-db=master_db_name->slave_db_name +VARIABLE_COMMENT Tells the slave to replicate binlog events into a different database than their original target on the master. Example: replicate-rewrite-db=master_db_name->slave_db_name NUMERIC_MIN_VALUE NULL NUMERIC_MAX_VALUE NULL NUMERIC_BLOCK_SIZE NULL @@ -3815,7 +3815,7 @@ COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME RPL_SEMI_SYNC_SLAVE_KILL_CONN_TIMEOUT VARIABLE_SCOPE GLOBAL VARIABLE_TYPE INT UNSIGNED -VARIABLE_COMMENT Timeout for the mysql connection used to kill the slave io_thread's connection on master. This timeout comes into play when stop slave is executed +VARIABLE_COMMENT Timeout for the MariaDB connection used to kill the slave io_thread's connection on master. This timeout comes into play when stop slave is executed NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 NUMERIC_BLOCK_SIZE 1 @@ -3905,7 +3905,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME SESSION_TRACK_TRANSACTION_INFO VARIABLE_SCOPE SESSION VARIABLE_TYPE ENUM -VARIABLE_COMMENT Track changes to the transaction attributes. OFF to disable; STATE to track just transaction state (Is there an active transaction? Does it have any data? etc.); CHARACTERISTICS to track transaction state and report all statements needed to start a transaction with the same characteristics (isolation level, read only/read write,snapshot - but not any work done / data modified within the transaction) +VARIABLE_COMMENT Track changes to the transaction attributes. OFF to disable; STATE to track just transaction state (Is there an active transaction? Does it have any data? etc.); CHARACTERISTICS to track transaction state and report all statements needed to start a transaction with the same characteristics (isolation level, read only/read write, snapshot - but not any work done / data modified within the transaction) NUMERIC_MIN_VALUE NULL NUMERIC_MAX_VALUE NULL NUMERIC_BLOCK_SIZE NULL @@ -4595,7 +4595,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME TCP_KEEPALIVE_INTERVAL VARIABLE_SCOPE GLOBAL VARIABLE_TYPE INT -VARIABLE_COMMENT The interval, in seconds, between when successive keep-alive packets are sent if no acknowledgement is received.If set to 0, system dependent default is used +VARIABLE_COMMENT The interval, in seconds, between when successive keep-alive packets are sent if no acknowledgement is received. If set to 0, system dependent default is used NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 2147483 NUMERIC_BLOCK_SIZE 1 @@ -4605,7 +4605,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME TCP_KEEPALIVE_PROBES VARIABLE_SCOPE GLOBAL VARIABLE_TYPE INT -VARIABLE_COMMENT The number of unacknowledged probes to send before considering the connection dead and notifying the application layer.If set to 0, system dependent default is used +VARIABLE_COMMENT The number of unacknowledged probes to send before considering the connection dead and notifying the application layer. If set to 0, system dependent default is used NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 2147483 NUMERIC_BLOCK_SIZE 1 @@ -4615,7 +4615,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME TCP_KEEPALIVE_TIME VARIABLE_SCOPE GLOBAL VARIABLE_TYPE INT -VARIABLE_COMMENT Timeout, in seconds, with no activity until the first TCP keep-alive packet is sent.If set to 0, system dependent default is used +VARIABLE_COMMENT Timeout, in seconds, with no activity until the first TCP keep-alive packet is sent. If set to 0, system dependent default is used NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 2147483 NUMERIC_BLOCK_SIZE 1 @@ -4675,7 +4675,7 @@ COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME THREAD_POOL_IDLE_TIMEOUT VARIABLE_SCOPE GLOBAL VARIABLE_TYPE INT UNSIGNED -VARIABLE_COMMENT Timeout in seconds for an idle thread in the thread pool.Worker thread will be shut down after timeout +VARIABLE_COMMENT Timeout in seconds for an idle thread in the thread pool. Worker thread will be shut down after timeout NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 4294967295 NUMERIC_BLOCK_SIZE 1 @@ -4705,7 +4705,7 @@ COMMAND_LINE_ARGUMENT REQUIRED 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 @@ -4735,7 +4735,7 @@ COMMAND_LINE_ARGUMENT REQUIRED 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 @@ -4865,7 +4865,7 @@ COMMAND_LINE_ARGUMENT NULL VARIABLE_NAME TX_ISOLATION VARIABLE_SCOPE SESSION VARIABLE_TYPE ENUM -VARIABLE_COMMENT Default transaction isolation level.This variable is deprecated and will be removed in a future release +VARIABLE_COMMENT Default transaction isolation level NUMERIC_MIN_VALUE NULL NUMERIC_MAX_VALUE NULL NUMERIC_BLOCK_SIZE NULL @@ -4875,7 +4875,7 @@ COMMAND_LINE_ARGUMENT NULL VARIABLE_NAME TX_READ_ONLY VARIABLE_SCOPE SESSION VARIABLE_TYPE BOOLEAN -VARIABLE_COMMENT Default transaction access mode. If set to OFF, the default, access is read/write. If set to ON, access is read-only. The SET TRANSACTION statement can also change the value of this variable. See SET TRANSACTION and START TRANSACTION.This variable is deprecated and will be removed in a future release +VARIABLE_COMMENT Default transaction access mode. If set to OFF, the default, access is read/write. If set to ON, access is read-only. The SET TRANSACTION statement can also change the value of this variable. See SET TRANSACTION and START TRANSACTION NUMERIC_MIN_VALUE NULL NUMERIC_MAX_VALUE NULL NUMERIC_BLOCK_SIZE NULL diff --git a/mysql-test/suite/sys_vars/r/sysvars_wsrep,32bit.rdiff b/mysql-test/suite/sys_vars/r/sysvars_wsrep,32bit.rdiff index 087c21022e5..30b03f26708 100644 --- a/mysql-test/suite/sys_vars/r/sysvars_wsrep,32bit.rdiff +++ b/mysql-test/suite/sys_vars/r/sysvars_wsrep,32bit.rdiff @@ -1,6 +1,6 @@ --- a/mysql-test/suite/sys_vars/r/sysvars_wsrep.result +++ b/mysql-test/suite/sys_vars/r/sysvars_wsrep.result -@@ -292,7 +292,7 @@ +@@ -292,7 +292,7 @@ GLOBAL_VALUE 0 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 -@@ -307,7 +307,7 @@ +@@ -307,7 +307,7 @@ GLOBAL_VALUE 2147483647 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 -@@ -337,7 +337,7 @@ +@@ -337,7 +337,7 @@ GLOBAL_VALUE 0 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 Number of replication events that are grouped together NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 1000 -@@ -532,7 +532,7 @@ +@@ -532,7 +532,7 @@ GLOBAL_VALUE 1 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 -@@ -562,7 +562,7 @@ +@@ -562,7 +562,7 @@ GLOBAL_VALUE 1 GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 1 VARIABLE_SCOPE GLOBAL diff --git a/mysql-test/suite/sys_vars/r/sysvars_wsrep.result b/mysql-test/suite/sys_vars/r/sysvars_wsrep.result index 4b14edeeb4d..9310119071c 100644 --- a/mysql-test/suite/sys_vars/r/sysvars_wsrep.result +++ b/mysql-test/suite/sys_vars/r/sysvars_wsrep.result @@ -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 Number of replication events that are grouped together NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 1000 NUMERIC_BLOCK_SIZE 1 diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 2b60db29b6a..395a95595b8 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -892,7 +892,7 @@ static struct my_option pfs_early_options[]= 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 unambiguous prefixes", &my_getopt_prefix_matching, &my_getopt_prefix_matching, 0, GET_BOOL, NO_ARG, 1, 0, 1, 0, 0, 0} }; @@ -6451,7 +6451,7 @@ struct my_option my_long_options[]= {"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 " + {"ansi", 'a', "Use ANSI SQL syntax instead of MariaDB syntax. This mode " "will also set transaction isolation level 'serializable'", 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}, /* @@ -6469,7 +6469,7 @@ struct my_option my_long_options[]= "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 MariaDB installation scripts", 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}, #endif {"character-set-client-handshake", 0, @@ -6485,7 +6485,7 @@ struct my_option my_long_options[]= {"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 mariadbd process during startup", &mysqld_chroot, &mysqld_chroot, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, {"collation-server", 0, "Set the default collation", @@ -6494,7 +6494,7 @@ struct my_option my_long_options[]= {"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 @@ -6541,7 +6541,7 @@ struct my_option my_long_options[]= GET_INT, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, #endif /* HAVE_REPLICATION */ {"debug-no-sync", 0, - "Disables system sync calls. Only for running tests or debugging!", + "Disables system sync calls. Only for running tests or debugging", &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, @@ -6593,7 +6593,7 @@ struct my_option my_long_options[]= 0, 0, 0, 0, 0, 0 }, {"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 " + "(not repair) tables while the MariaDB server is running. Disable with " "--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 @@ -6687,7 +6687,7 @@ 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 mariadbd process 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 " @@ -6786,8 +6786,8 @@ struct my_option my_long_options[]= #if defined(_WIN32) && !defined(EMBEDDED_LIBRARY) {"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, + "before trying to kill the windows service during startup", + &slow_start_timeout, &slow_start_timeout, 0, GET_ULONG, REQUIRED_ARG, 15000, 0, 0, 0, 0, 0}, #endif #ifdef HAVE_OPENSSL @@ -6824,12 +6824,12 @@ 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", #else "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}, + 0, 0, "", 0, 0}, {"transaction-isolation", 0, "Default transaction isolation level", &global_system_variables.tx_isolation, @@ -6841,7 +6841,7 @@ struct my_option my_long_options[]= &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', "User to run mariadbd process as", 0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, {"verbose", 'v', "Used with --help option for detailed help", &opt_verbose, &opt_verbose, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0}, @@ -7748,7 +7748,7 @@ static void usage(void) puts("Starts the MariaDB database server.\n"); printf("Usage: %s [OPTIONS]\n", my_progname); if (!opt_verbose) - puts("\nFor more help options (several pages), use mysqld --verbose --help."); + puts("\nFor more help options (several pages), use mariadbd --verbose --help."); else { #ifdef _WIN32 @@ -7777,7 +7777,8 @@ static void usage(void) } puts("\nTo see what variables a running server is using, type" - "\n'SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES' instead of 'mysqld --verbose --help' or 'mariadbd --verbose --help'."); + "\n'SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES' instead " + "of 'mariadbd --verbose --help'."); } DBUG_VOID_RETURN; } diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc index c4e30df63fe..5290e61ddeb 100644 --- a/sql/sys_vars.cc +++ b/sql/sys_vars.cc @@ -510,7 +510,7 @@ static Sys_var_mybool Sys_automatic_sp_privileges( static Sys_var_ulong Sys_back_log( "back_log", "The number of outstanding connection requests " "MariaDB can have. This comes into play when the main MariaDB thread " - "gets very many connection requests in a very short time", + "gets many connection requests in a very short time", AUTO_SET READ_ONLY GLOBAL_VAR(back_log), CMD_LINE(REQUIRED_ARG), VALID_RANGE(0, 65535), DEFAULT(150), BLOCK_SIZE(1)); @@ -693,13 +693,11 @@ static Sys_var_on_access Sys_binlog_format( - "binlog_format", "What form of binary logging the master will " - "use: either ROW for row-based binary logging, STATEMENT " - "for statement-based binary logging, or MIXED. MIXED is statement-" - "based binary logging except for those statements where only row-" - "based is correct: those which involve user-defined functions (i.e. " - "UDFs) or the UUID() function; for those, row-based binary logging is " - "automatically used", + "binlog_format", "The binary logging format the master will " + "use: ROW for row-based binary logging (safer), STATEMENT " + "for statement-based binary logging (smaller binary logs), MIXED " + "for statement-based binary logging when it's safe with fall back " + "to row-based otherwise", SESSION_VAR(binlog_format), CMD_LINE(REQUIRED_ARG, OPT_BINLOG_FORMAT), binlog_format_names, DEFAULT(BINLOG_FORMAT_MIXED), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(binlog_format_check), @@ -750,7 +748,7 @@ static Sys_var_bit Sys_explicit_defaults_for_timestamp( static Sys_var_ulonglong Sys_bulk_insert_buff_size( "bulk_insert_buffer_size", "Size of tree cache used in bulk " - "insert optimisation. Note that this is a limit per thread!", + "insert optimization. Note that this is a limit per thread", SESSION_VAR(bulk_insert_buff_size), CMD_LINE(REQUIRED_ARG), VALID_RANGE(0, SIZE_T_MAX), DEFAULT(8192*1024), BLOCK_SIZE(1)); @@ -1042,7 +1040,7 @@ static Sys_var_on_access_global Sys_connect_timeout( "connect_timeout", - "The number of seconds the mysqld server is waiting for a connect " + "The number of seconds the MariaDB server is waiting for a connect " "packet before responding with 'Bad handshake'", GLOBAL_VAR(connect_timeout), CMD_LINE(REQUIRED_ARG), VALID_RANGE(2, LONG_TIMEOUT), DEFAULT(CONNECT_TIMEOUT), BLOCK_SIZE(1)); @@ -1457,9 +1455,8 @@ static Sys_var_ulonglong Sys_join_buffer_size( static Sys_var_keycache Sys_key_buffer_size( "key_buffer_size", "The size of the buffer used for " - "index blocks for MyISAM tables. Increase this to get better index " - "handling (for all reads and multiple writes) to as much as you can " - "afford", + "index blocks for MyISAM tables. Increase this to get faster index " + "handling", KEYCACHE_VAR(param_buff_size), CMD_LINE(REQUIRED_ARG, OPT_KEY_BUFFER_SIZE), VALID_RANGE(0, SIZE_T_MAX), DEFAULT(KEY_CACHE_SIZE), @@ -1508,7 +1505,7 @@ static Sys_var_keycache Sys_key_cache_file_hash_size( static Sys_var_mybool Sys_large_files_support( "large_files_support", - "Whether mysqld was compiled with options for large file support", + "Whether mariadbd was compiled with options for large file support", READ_ONLY GLOBAL_VAR(opt_large_files), CMD_LINE_HELP_ONLY, DEFAULT(sizeof(my_off_t) > 4)); @@ -1544,7 +1541,7 @@ static Sys_var_ulong Sys_lock_wait_timeout( #ifdef HAVE_MLOCKALL static Sys_var_mybool Sys_locked_in_memory( "locked_in_memory", - "Whether mysqld was locked in memory with --memlock", + "Whether mariadbd process was locked in memory with --memlock", READ_ONLY GLOBAL_VAR(locked_in_memory), NO_CMD_LINE, DEFAULT(FALSE)); #endif @@ -1564,7 +1561,7 @@ static Sys_var_on_access_global Sys_log_bin_compress_min_len( "log_bin_compress_min_len", - "Minimum length of sql statement(in statement mode) or record(in row mode)" + "Minimum length of sql statement (in statement mode) or record (in row mode) " "that can be compressed", GLOBAL_VAR(opt_bin_log_compress_min_len), CMD_LINE(OPT_ARG), VALID_RANGE(10, 1024), DEFAULT(256), BLOCK_SIZE(1)); @@ -1619,7 +1616,7 @@ static Sys_var_bit Sys_log_slow_slave_statements( static Sys_var_ulong Sys_log_warnings( "log_warnings", - "Log some non critical warnings to the error log." + "Log some non-critical warnings to the error log. " "Value can be between 0 and 11. Higher values mean more verbosity", SESSION_VAR(log_warnings), CMD_LINE(OPT_ARG, 'W'), @@ -1907,14 +1904,16 @@ static Sys_var_ulong Sys_metadata_locks_cache_size( "metadata_locks_cache_size", "Unused", READ_ONLY GLOBAL_VAR(mdl_locks_cache_size), CMD_LINE(REQUIRED_ARG), VALID_RANGE(1, 1024*1024), DEFAULT(1024), - BLOCK_SIZE(1)); + BLOCK_SIZE(1), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), ON_UPDATE(0), + DEPRECATED(1105, "")); static ulong mdl_locks_hash_partitions; static Sys_var_ulong Sys_metadata_locks_hash_instances( "metadata_locks_hash_instances", "Unused", READ_ONLY GLOBAL_VAR(mdl_locks_hash_partitions), CMD_LINE(REQUIRED_ARG), VALID_RANGE(1, 1024), DEFAULT(8), - BLOCK_SIZE(1)); + BLOCK_SIZE(1), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), ON_UPDATE(0), + DEPRECATED(1105, "")); static Sys_var_on_access_session @@ -2003,7 +2002,7 @@ Sys_gtid_seq_no( #ifdef HAVE_REPLICATION static unsigned char opt_gtid_binlog_pos_dummy; static Sys_var_gtid_binlog_pos Sys_gtid_binlog_pos( - "gtid_binlog_pos", "Last GTID logged to the binary log, per replication" + "gtid_binlog_pos", "Last GTID logged to the binary log, per replication " "domain", READ_ONLY GLOBAL_VAR(opt_gtid_binlog_pos_dummy), NO_CMD_LINE); @@ -2852,9 +2851,9 @@ export sys_var *Sys_old_passwords_ptr= &Sys_old_passwords; // for sql_acl.cc static Sys_var_ulong Sys_open_files_limit( "open_files_limit", - "If this is not 0, then mysqld will use this value to reserve file " + "If this is not 0, then mariadbd will use this value to reserve file " "descriptors to use with setrlimit(). If this value is 0 or autoset " - "then mysqld will reserve max_connections*5 or max_connections + " + "then mariadbd will reserve max_connections*5 or max_connections + " "table_cache*2 (whichever is larger) number of file descriptors", AUTO_SET READ_ONLY GLOBAL_VAR(open_files_limit), CMD_LINE(REQUIRED_ARG), VALID_RANGE(0, OS_FILE_LIMIT), DEFAULT(0), BLOCK_SIZE(1)); @@ -2893,7 +2892,7 @@ static Sys_var_ulong Sys_optimizer_use_condition_selectivity( "not backed by any index to calculate the cardinality of a partial join, " "4 - use histograms to calculate selectivity of range conditions that " "are not backed by any index to calculate the cardinality of " - "a partial join." + "a partial join. " "5 - additionally use selectivity of certain non-range predicates " "calculated on record samples", SESSION_VAR(optimizer_use_condition_selectivity), CMD_LINE(REQUIRED_ARG), @@ -2997,7 +2996,7 @@ static Sys_var_ulong Sys_optimizer_adjust_secondary_key_costs( DEPRECATED(1100, "")); static Sys_var_charptr_fscs Sys_pid_file( - "pid_file", "Pid file used by safe_mysqld", + "pid_file", "Pid file used by mariadbd-safe", READ_ONLY GLOBAL_VAR(pidfile_name_ptr), CMD_LINE(REQUIRED_ARG), DEFAULT(0)); @@ -3783,7 +3782,7 @@ static Sys_var_on_access_global Sys_semisync_slave_kill_conn_timeout( "rpl_semi_sync_slave_kill_conn_timeout", - "Timeout for the mysql connection used to kill the slave io_thread's " + "Timeout for the MariaDB connection used to kill the slave io_thread's " "connection on master. This timeout comes into play when stop slave " "is executed", GLOBAL_VAR(rpl_semi_sync_slave_kill_conn_timeout), @@ -4187,8 +4186,10 @@ static Sys_var_on_access_global Sys_thread_pool_priority( "thread_pool_priority", - "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", + "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", SESSION_VAR(threadpool_priority), CMD_LINE(REQUIRED_ARG), threadpool_priority_names, DEFAULT(TP_PRIORITY_AUTO)); @@ -4196,7 +4197,7 @@ static Sys_var_on_access_global Sys_threadpool_idle_thread_timeout( "thread_pool_idle_timeout", - "Timeout in seconds for an idle thread in the thread pool." + "Timeout in seconds for an idle thread in the thread pool. " "Worker thread will be shut down after timeout", GLOBAL_VAR(threadpool_idle_timeout), CMD_LINE(REQUIRED_ARG), VALID_RANGE(1, UINT_MAX), DEFAULT(60), BLOCK_SIZE(1) @@ -4225,8 +4226,8 @@ static Sys_var_on_access_global Sys_threadpool_stall_limit( "thread_pool_stall_limit", - "Maximum query execution time in milliseconds," - "before an executing non-yielding thread is considered stalled." + "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", GLOBAL_VAR(threadpool_stall_limit), CMD_LINE(REQUIRED_ARG), @@ -4292,8 +4293,7 @@ static bool check_tx_isolation(sys_var *self, THD *thd, set_var *var) // NO_CMD_LINE - different name of the option static Sys_var_tx_isolation Sys_tx_isolation( - "tx_isolation", "Default transaction isolation level." - "This variable is deprecated and will be removed in a future release", + "tx_isolation", "Default transaction isolation level", SESSION_VAR(tx_isolation), NO_CMD_LINE, tx_isolation_names, DEFAULT(ISO_REPEATABLE_READ), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(check_tx_isolation), @@ -4352,8 +4352,7 @@ static Sys_var_tx_read_only Sys_tx_read_only( "tx_read_only", "Default transaction access mode. If set to OFF, " "the default, access is read/write. If set to ON, access is read-only. " "The SET TRANSACTION statement can also change the value of this variable. " - "See SET TRANSACTION and START TRANSACTION." - "This variable is deprecated and will be removed in a future release", + "See SET TRANSACTION and START TRANSACTION", SESSION_VAR(tx_read_only), NO_CMD_LINE, DEFAULT(0), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(check_tx_read_only), ON_UPDATE(0), DEPRECATED(1101, "transaction_read_only")); @@ -4530,11 +4529,11 @@ static Sys_var_on_access_global Sys_gtid_pos_auto_engines( "gtid_pos_auto_engines", - "List of engines for which to automatically create a " - "mysql.gtid_slave_pos_ENGINE table, if a transaction using that engine " - "is replicated. This can be used to avoid introducing cross-engine " - "transactions, if engines are used different from that used by table " - "mysql.gtid_slave_pos", + "List of engines for which a dedicated mysql.gtid_slave_pos_ENGINE " + "table is created automatically, if a transaction using that engine " + "is replicated. This helps to avoid cross-engine " + "transactions, as would be the case when user tables and " + "mysql.gtid_slave_pos were created in different transactional engines", GLOBAL_VAR(opt_gtid_pos_auto_plugins), NO_CMD_LINE, DEFAULT(>id_pos_auto_engines), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(check_gtid_pos_auto_engines)); @@ -4618,9 +4617,10 @@ static bool fix_autocommit(sys_var *self, THD *thd, enum_var_type type) static Sys_var_bit Sys_autocommit( "autocommit", "If set to 1, the default, all queries are committed " - "immediately. If set to 0, they are only committed upon a COMMIT statement" - ", or rolled back with a ROLLBACK statement. If autocommit is set to 0, " - "and then changed to 1, all open transactions are immediately committed", + "immediately. If set to 0, they are only committed upon a COMMIT " + "statement, or rolled back with a ROLLBACK statement. If autocommit is " + "set to 0, and then changed to 1, all open transactions are immediately " + "committed", NO_SET_STMT SESSION_VAR(option_bits), NO_CMD_LINE, OPTION_AUTOCOMMIT, DEFAULT(TRUE), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), ON_UPDATE(fix_autocommit)); @@ -5137,9 +5137,9 @@ Sys_proxy_protocol_networks( "proxy_protocol_networks", "Enable proxy protocol for these source " "networks. The syntax is a comma separated list of IPv4 and IPv6 " "networks. If the network doesn't contain mask, it is considered to be " - "a single host. \"*\" represents all networks and must the only " - "directive on the line. String \"localhost\" represents non-TCP " - "local connections (Unix domain socket, Windows named pipe or shared memory)", + "a single host. \"*\" represents all networks and must be the only " + "directive on the line. String \"localhost\" represents non-TCP local " + "connections (Unix domain socket, Windows named pipe or shared memory)", GLOBAL_VAR(my_proxy_protocol_networks), CMD_LINE(REQUIRED_ARG), DEFAULT(""), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(check_proxy_protocol_networks), ON_UPDATE(fix_proxy_protocol_networks)); @@ -5319,7 +5319,7 @@ static Sys_var_have Sys_have_rtree_keys( static Sys_var_have Sys_have_ssl( "have_ssl", "If the server supports secure connections, will be set to YES, " "otherwise will be set to NO. If set to DISABLED, the server was compiled with " - "TLS support, but was not started with TLS support (see the mysqld options). " + "TLS support, but was not started with TLS support (see the mariadbd options). " "See also have_openssl", READ_ONLY GLOBAL_VAR(have_ssl), NO_CMD_LINE); @@ -5360,7 +5360,7 @@ static bool fix_log_state(sys_var *self, THD *thd, enum_var_type type); static Sys_var_mybool Sys_general_log( "general_log", "Log connections and queries to a table or log file. " "Defaults logging to a file 'hostname'.log or a table mysql.general_log" - "if --log-output=TABLE is used", + " if --log-output=TABLE is used", GLOBAL_VAR(opt_log), CMD_LINE(OPT_ARG), DEFAULT(FALSE), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), ON_UPDATE(fix_log_state)); @@ -5682,7 +5682,7 @@ static Sys_var_binlog_filter Sys_binlog_do_db( static Sys_var_rpl_filter Sys_replicate_rewrite_db( "replicate_rewrite_db", OPT_REPLICATE_REWRITE_DB, "Tells the slave to replicate binlog events " - "into a different database than their original target on the master." + "into a different database than their original target on the master. " "Example: replicate-rewrite-db=master_db_name->slave_db_name", PRIV_SET_SYSTEM_GLOBAL_VAR_REPLICATE_REWRITE_DB); @@ -6342,7 +6342,8 @@ static Sys_var_mybool Sys_wsrep_log_conflicts( GLOBAL_VAR(wsrep_log_conflicts), CMD_LINE(OPT_ARG), DEFAULT(FALSE)); static Sys_var_ulong Sys_wsrep_mysql_replication_bundle( - "wsrep_mysql_replication_bundle", "mysql replication group commit", + "wsrep_mysql_replication_bundle", + "Number of replication events that are grouped together", GLOBAL_VAR(wsrep_mysql_replication_bundle), CMD_LINE(REQUIRED_ARG), VALID_RANGE(0, 1000), DEFAULT(0), BLOCK_SIZE(1)); @@ -6461,23 +6462,25 @@ vio_keepalive_opts opt_vio_keepalive; static Sys_var_int Sys_keepalive_time( "tcp_keepalive_time", - "Timeout, in seconds, with no activity until the first TCP keep-alive packet is sent." - "If set to 0, system dependent default is used", + "Timeout, in seconds, with no activity until the first TCP keep-alive " + "packet is sent. If set to 0, system dependent default is used", AUTO_SET GLOBAL_VAR(opt_vio_keepalive.idle), CMD_LINE(REQUIRED_ARG), VALID_RANGE(0, INT_MAX32/1000), DEFAULT(0), BLOCK_SIZE(1)); static Sys_var_int Sys_keepalive_interval( "tcp_keepalive_interval", - "The interval, in seconds, between when successive keep-alive packets are sent if no acknowledgement is received." - "If set to 0, system dependent default is used", + "The interval, in seconds, between when successive keep-alive packets " + "are sent if no acknowledgement is received. If set to 0, system " + "dependent default is used", AUTO_SET GLOBAL_VAR(opt_vio_keepalive.interval), CMD_LINE(REQUIRED_ARG), VALID_RANGE(0, INT_MAX32/1000), DEFAULT(0), BLOCK_SIZE(1)); static Sys_var_int Sys_keepalive_probes( "tcp_keepalive_probes", - "The number of unacknowledged probes to send before considering the connection dead and notifying the application layer." + "The number of unacknowledged probes to send before considering the " + "connection dead and notifying the application layer. " "If set to 0, system dependent default is used", AUTO_SET GLOBAL_VAR(opt_vio_keepalive.probes), CMD_LINE(REQUIRED_ARG), VALID_RANGE(0, INT_MAX32/1000), DEFAULT(0), @@ -6596,7 +6599,10 @@ static const char *log_slow_filter_names[]= static Sys_var_set Sys_log_slow_filter( "log_slow_filter", - "Log only certain types of queries to the slow log. If variable empty all kind of queries are logged. All types are bound by slow_query_time, except 'not_using_index' which is always logged if enabled", + "Log only certain types of queries to the slow log. If variable " + "is empty all kinds of queries are logged. All types are bound by " + "slow_query_time, except 'not_using_index' which is always logged " + "if enabled", SESSION_VAR(log_slow_filter), CMD_LINE(REQUIRED_ARG), log_slow_filter_names, /* by default we log all queries except 'not_using_index' */ @@ -6870,12 +6876,11 @@ Sys_binlog_row_image( "before and after image are logged. 'FULL_NODUP', means that all " "columns are logged in before image, but only changed columns or all " "columns of inserted record are logged in after image, " - "'NOBLOB', means that mysqld avoids logging " + "'NOBLOB', means that MariaDB avoids logging " "blob columns whenever possible (eg, blob column was not changed or " "is not part of primary key). 'MINIMAL', means that a PK equivalent (PK " "columns or full row if there is no PK in the table) is logged in the " - "before image, and only changed columns are logged in the after image. " - "(Default: FULL)", + "before image, and only changed columns are logged in the after image", SESSION_VAR(binlog_row_image), CMD_LINE(REQUIRED_ARG), binlog_row_image_names, DEFAULT(BINLOG_ROW_IMAGE_FULL)); @@ -6884,10 +6889,10 @@ static Sys_var_on_access_global Sys_binlog_row_metadata( "binlog_row_metadata", - "Controls whether metadata is logged using FULL , MINIMAL format and NO_LOG." - "FULL causes all metadata to be logged; MINIMAL means that only " - "metadata actually required by slave is logged; NO_LOG NO metadata will be logged." - "Default: NO_LOG", + "Controls whether metadata is logged using FULL , MINIMAL format and " + "NO_LOG. FULL causes all metadata to be logged; MINIMAL means that only " + "metadata actually required by slave is logged; NO_LOG NO metadata will " + "be logged", GLOBAL_VAR(binlog_row_metadata), CMD_LINE(REQUIRED_ARG), binlog_row_metadata_names, DEFAULT(Table_map_log_event::BINLOG_ROW_METADATA_NO_LOG), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(NULL), @@ -7119,7 +7124,7 @@ static Sys_var_enum Sys_session_track_transaction_info( "STATE to track just transaction state (Is there an active transaction? " "Does it have any data? etc.); CHARACTERISTICS to track transaction " "state and report all statements needed to start a transaction with " - "the same characteristics (isolation level, read only/read write," + "the same characteristics (isolation level, read only/read write, " "snapshot - but not any work done / data modified within the " "transaction)", SESSION_VAR(session_track_transaction_info), @@ -7255,7 +7260,7 @@ static Sys_var_engine_optimizer_cost Sys_optimizer_key_copy_cost( static Sys_var_engine_optimizer_cost Sys_optimizer_index_block_copy_cost( "optimizer_index_block_copy_cost", - "Cost of copying a key block from the cache to intern storage as part of " + "Cost of copying a key block from the cache to internal storage as part of " "an index scan", COST_VAR(index_block_copy_cost), CMD_LINE(REQUIRED_ARG, OPT_COSTS_INDEX_BLOCK_COPY_COST), diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc index 47cfafb438f..a0d815befde 100644 --- a/storage/innobase/handler/ha_innodb.cc +++ b/storage/innobase/handler/ha_innodb.cc @@ -19312,8 +19312,7 @@ static my_bool innodb_prefix_index_cluster_optimization; static MYSQL_SYSVAR_BOOL(prefix_index_cluster_optimization, innodb_prefix_index_cluster_optimization, PLUGIN_VAR_OPCMDARG | PLUGIN_VAR_DEPRECATED, - "Deprecated parameter with no effect", - nullptr, nullptr, TRUE); + "Unused", nullptr, nullptr, FALSE); static MYSQL_SYSVAR_STR(data_file_path, innobase_data_file_path, PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY, @@ -19350,7 +19349,7 @@ static ulong innodb_purge_rseg_truncate_frequency; static MYSQL_SYSVAR_ULONG(purge_rseg_truncate_frequency, innodb_purge_rseg_truncate_frequency, PLUGIN_VAR_OPCMDARG | PLUGIN_VAR_DEPRECATED, - "Deprecated parameter with no effect", + "Unused", NULL, NULL, 128, 1, 128, 0); static void innodb_undo_log_truncate_update(THD *thd, struct st_mysql_sys_var*, @@ -19424,7 +19423,7 @@ static MYSQL_SYSVAR_ENUM(stats_method, srv_innodb_stats_method, static MYSQL_SYSVAR_ULONG(buf_dump_status_frequency, srv_buf_dump_status_frequency, PLUGIN_VAR_RQCMDARG, - "A number between [0, 100] that tells how oftern buffer pool dump status " + "A number that tells how often 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)", @@ -19639,7 +19638,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", + "Encrypt the temporary table data", NULL, NULL, false); static MYSQL_SYSVAR_BOOL(truncate_temporary_tablespace_now, diff --git a/storage/myisam/ha_myisam.cc b/storage/myisam/ha_myisam.cc index ef798499399..b52c4b7e374 100644 --- a/storage/myisam/ha_myisam.cc +++ b/storage/myisam/ha_myisam.cc @@ -87,7 +87,7 @@ static MYSQL_SYSVAR_BOOL(use_mmap, opt_myisam_use_mmap, PLUGIN_VAR_NOCMDARG, static MYSQL_SYSVAR_ULONGLONG(mmap_size, myisam_mmap_size, PLUGIN_VAR_RQCMDARG|PLUGIN_VAR_READONLY, "Restricts the total memory " - "used for memory mapping of MySQL tables", NULL, NULL, + "used for memory mapping of MyISAM tables", NULL, NULL, SIZE_T_MAX, MEMMAP_EXTRA_MARGIN, SIZE_T_MAX, 1); static MYSQL_THDVAR_ENUM(stats_method, PLUGIN_VAR_RQCMDARG,