Skip to content

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

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
parent 53582238
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 430 additions and 430 deletions
mysql-test/main/mysqld--help,win.rdiff
View file @ 5296f908
--- 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
......
mysql-test/main/mysqld--help.result
View file @ 5296f908
This diff is collapsed.
mysql-test/suite/sys_vars/r/sysvars_innodb,32bit.rdiff
View file @ 5296f908
--- 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 @@
......
mysql-test/suite/sys_vars/r/sysvars_innodb.result
View file @ 5296f908
......@@ -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
......
mysql-test/suite/sys_vars/r/sysvars_server_embedded,32bit.rdiff
View file @ 5296f908
--- 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 @@
......
mysql-test/suite/sys_vars/r/sysvars_wsrep,32bit.rdiff
View file @ 5296f908
--- 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
......
mysql-test/suite/sys_vars/r/sysvars_wsrep.result
View file @ 5296f908
......@@ -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
......
sql/mysqld.cc
View file @ 5296f908
......@@ -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;
}
......
sql/sys_vars.cc
View file @ 5296f908
This diff is collapsed.
storage/innobase/handler/ha_innodb.cc
View file @ 5296f908
......@@ -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,
......
storage/myisam/ha_myisam.cc
View file @ 5296f908
......@@ -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,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7