Skip to content

Commit 5296f90

Browse files
committed
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
1 parent 5358223 commit 5296f90

14 files changed

+430
-430
lines changed

mysql-test/main/mysqld--help,win.rdiff

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,41 @@
11
--- a/mysql-test/main/mysqld--help.result
22
+++ b/mysql-test/main/mysqld--help.result
3-
@@ -220,6 +220,7 @@
3+
@@ -216,6 +216,7 @@ The following specify which files/extra groups are read (specified before remain
44
--console Write error output on screen; don't remove the console
5-
window on windows
5+
window on Windows
66
--core-file Write core on crashes
77
+ (Defaults to on; use --skip-core-file to disable.)
88
-h, --datadir=name Path to the database root directory
99
--deadlock-search-depth-long=#
1010
Long search depth for the two-step deadlock detection
11-
@@ -722,6 +723,7 @@
11+
@@ -717,6 +718,7 @@ The following specify which files/extra groups are read (specified before remain
1212
Use MySQL-5.6 (instead of MariaDB-5.3) format for TIME,
1313
DATETIME, TIMESTAMP columns
1414
(Defaults to on; use --skip-mysql56-temporal-format to disable.)
1515
+ --named-pipe Enable the named pipe (NT)
1616
--net-buffer-length=#
1717
Buffer length for TCP/IP and socket communication
1818
--net-read-timeout=#
19-
@@ -1419,6 +1421,10 @@
19+
@@ -1414,6 +1416,10 @@ The following specify which files/extra groups are read (specified before remain
2020
Alias for log_slow_query_file. Log slow queries to given
2121
log file. Defaults logging to 'hostname'-slow.log. Must
2222
be enabled to activate other slow log options
2323
+ --slow-start-timeout=#
2424
+ Maximum number of milliseconds that the service control
2525
+ manager should wait before trying to kill the windows
26-
+ service during startup(Default: 15000)
26+
+ service during startup
2727
--socket=name Socket file to use for connection
2828
--sort-buffer-size=#
2929
Each thread that needs to do a sort allocates a buffer of
30-
@@ -1443,6 +1449,7 @@
30+
@@ -1438,6 +1444,7 @@ The following specify which files/extra groups are read (specified before remain
3131
deleting or updating every row in a table
3232
--stack-trace Print a symbolic stack trace on failure
3333
(Defaults to on; use --skip-stack-trace to disable.)
3434
+ --standalone Dummy option to start as a standalone program (NT)
3535
--standard-compliant-cte
3636
Allow only CTEs compliant to SQL standard
3737
(Defaults to on; use --skip-standard-compliant-cte to disable.)
38-
@@ -1522,6 +1529,11 @@
38+
@@ -1517,6 +1524,11 @@ The following specify which files/extra groups are read (specified before remain
3939
--thread-pool-max-threads=#
4040
Maximum allowed number of worker threads in the thread
4141
pool
@@ -47,7 +47,7 @@
4747
--thread-pool-oversubscribe=#
4848
How many additional active worker threads in a group are
4949
allowed
50-
@@ -1560,8 +1572,8 @@
50+
@@ -1555,8 +1567,8 @@ The following specify which files/extra groups are read (specified before remain
5151
automatically convert it to an on-disk MyISAM or Aria
5252
table
5353
-t, --tmpdir=name Path for temporary files. Several paths may be specified,
@@ -58,23 +58,23 @@
5858
--transaction-alloc-block-size=#
5959
Allocation block size for transactions to be stored in
6060
binary log
61-
@@ -1788,6 +1800,7 @@
61+
@@ -1783,6 +1795,7 @@ myisam-sort-buffer-size 134216704
6262
myisam-stats-method NULLS_UNEQUAL
6363
myisam-use-mmap FALSE
6464
mysql56-temporal-format TRUE
6565
+named-pipe FALSE
6666
net-buffer-length 16384
6767
net-read-timeout 30
6868
net-retry-count 10
69-
@@ -1962,6 +1975,7 @@
69+
@@ -1957,6 +1970,7 @@ slave-transaction-retry-interval 0
7070
slave-type-conversions
7171
slow-launch-time 2
7272
slow-query-log FALSE
7373
+slow-start-timeout 15000
7474
sort-buffer-size 2097152
7575
sql-mode STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION
7676
sql-safe-updates FALSE
77-
@@ -1989,6 +2003,8 @@
77+
@@ -1984,6 +1998,8 @@ thread-pool-dedicated-listener FALSE
7878
thread-pool-exact-stats FALSE
7979
thread-pool-idle-timeout 60
8080
thread-pool-max-threads 65536

mysql-test/main/mysqld--help.result

Lines changed: 56 additions & 61 deletions
Large diffs are not rendered by default.

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

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
--- sysvars_innodb.result
2-
+++ sysvars_innodb.result
3-
@@ -47,7 +47,7 @@
1+
--- a/mysql-test/suite/sys_vars/r/sysvars_innodb.result
2+
+++ b/mysql-test/suite/sys_vars/r/sysvars_innodb.result
3+
@@ -47,7 +47,7 @@ VARIABLE_NAME INNODB_ADAPTIVE_HASH_INDEX_PARTS
44
SESSION_VALUE NULL
55
DEFAULT_VALUE 8
66
VARIABLE_SCOPE GLOBAL
@@ -9,7 +9,7 @@
99
VARIABLE_COMMENT Number of InnoDB Adaptive Hash Index Partitions (default 8)
1010
NUMERIC_MIN_VALUE 1
1111
NUMERIC_MAX_VALUE 512
12-
@@ -71,7 +71,7 @@
12+
@@ -71,7 +71,7 @@ VARIABLE_NAME INNODB_AUTOINC_LOCK_MODE
1313
SESSION_VALUE NULL
1414
DEFAULT_VALUE 1
1515
VARIABLE_SCOPE GLOBAL
@@ -18,7 +18,7 @@
1818
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)
1919
NUMERIC_MIN_VALUE 0
2020
NUMERIC_MAX_VALUE 2
21-
@@ -83,10 +83,10 @@
21+
@@ -83,10 +83,10 @@ VARIABLE_NAME INNODB_BUFFER_POOL_CHUNK_SIZE
2222
SESSION_VALUE NULL
2323
DEFAULT_VALUE 0
2424
VARIABLE_SCOPE GLOBAL
@@ -31,7 +31,7 @@
3131
NUMERIC_BLOCK_SIZE 1048576
3232
ENUM_VALUE_LIST NULL
3333
READ_ONLY YES
34-
@@ -119,7 +119,7 @@
34+
@@ -119,7 +119,7 @@ VARIABLE_NAME INNODB_BUFFER_POOL_DUMP_PCT
3535
SESSION_VALUE NULL
3636
DEFAULT_VALUE 25
3737
VARIABLE_SCOPE GLOBAL
@@ -40,16 +40,16 @@
4040
VARIABLE_COMMENT Dump only the hottest N% of each buffer pool, defaults to 25
4141
NUMERIC_MIN_VALUE 1
4242
NUMERIC_MAX_VALUE 100
43-
@@ -203,7 +203,7 @@
43+
@@ -203,7 +203,7 @@ VARIABLE_NAME INNODB_BUF_DUMP_STATUS_FREQUENCY
4444
SESSION_VALUE NULL
4545
DEFAULT_VALUE 0
4646
VARIABLE_SCOPE GLOBAL
4747
-VARIABLE_TYPE BIGINT UNSIGNED
4848
+VARIABLE_TYPE INT UNSIGNED
49-
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)
49+
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)
5050
NUMERIC_MIN_VALUE 0
5151
NUMERIC_MAX_VALUE 100
52-
@@ -275,7 +275,7 @@
52+
@@ -275,7 +275,7 @@ VARIABLE_NAME INNODB_COMPRESSION_FAILURE_THRESHOLD_PCT
5353
SESSION_VALUE NULL
5454
DEFAULT_VALUE 5
5555
VARIABLE_SCOPE GLOBAL
@@ -58,7 +58,7 @@
5858
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
5959
NUMERIC_MIN_VALUE 0
6060
NUMERIC_MAX_VALUE 100
61-
@@ -299,7 +299,7 @@
61+
@@ -299,7 +299,7 @@ VARIABLE_NAME INNODB_COMPRESSION_PAD_PCT_MAX
6262
SESSION_VALUE NULL
6363
DEFAULT_VALUE 50
6464
VARIABLE_SCOPE GLOBAL
@@ -67,7 +67,7 @@
6767
VARIABLE_COMMENT Percentage of empty space on a data page that can be reserved to make the page compressible
6868
NUMERIC_MIN_VALUE 0
6969
NUMERIC_MAX_VALUE 75
70-
@@ -527,7 +527,7 @@
70+
@@ -527,7 +527,7 @@ VARIABLE_NAME INNODB_FATAL_SEMAPHORE_WAIT_THRESHOLD
7171
SESSION_VALUE NULL
7272
DEFAULT_VALUE 600
7373
VARIABLE_SCOPE GLOBAL
@@ -76,7 +76,7 @@
7676
VARIABLE_COMMENT Maximum number of seconds that semaphore times out in InnoDB
7777
NUMERIC_MIN_VALUE 1
7878
NUMERIC_MAX_VALUE 4294967295
79-
@@ -575,7 +575,7 @@
79+
@@ -575,7 +575,7 @@ VARIABLE_NAME INNODB_FLUSHING_AVG_LOOPS
8080
SESSION_VALUE NULL
8181
DEFAULT_VALUE 30
8282
VARIABLE_SCOPE GLOBAL
@@ -85,7 +85,7 @@
8585
VARIABLE_COMMENT Number of iterations over which the background flushing is averaged
8686
NUMERIC_MIN_VALUE 1
8787
NUMERIC_MAX_VALUE 1000
88-
@@ -599,7 +599,7 @@
88+
@@ -599,7 +599,7 @@ VARIABLE_NAME INNODB_FLUSH_LOG_AT_TRX_COMMIT
8989
SESSION_VALUE NULL
9090
DEFAULT_VALUE 1
9191
VARIABLE_SCOPE GLOBAL
@@ -94,7 +94,7 @@
9494
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
9595
NUMERIC_MIN_VALUE 0
9696
NUMERIC_MAX_VALUE 3
97-
@@ -623,7 +623,7 @@
97+
@@ -623,7 +623,7 @@ VARIABLE_NAME INNODB_FLUSH_NEIGHBORS
9898
SESSION_VALUE NULL
9999
DEFAULT_VALUE 1
100100
VARIABLE_SCOPE GLOBAL
@@ -103,7 +103,7 @@
103103
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
104104
NUMERIC_MIN_VALUE 0
105105
NUMERIC_MAX_VALUE 2
106-
@@ -659,7 +659,7 @@
106+
@@ -659,7 +659,7 @@ VARIABLE_NAME INNODB_FORCE_RECOVERY
107107
SESSION_VALUE NULL
108108
DEFAULT_VALUE 0
109109
VARIABLE_SCOPE GLOBAL
@@ -112,7 +112,7 @@
112112
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
113113
NUMERIC_MIN_VALUE 0
114114
NUMERIC_MAX_VALUE 6
115-
@@ -683,10 +683,10 @@
115+
@@ -683,10 +683,10 @@ VARIABLE_NAME INNODB_FT_CACHE_SIZE
116116
SESSION_VALUE NULL
117117
DEFAULT_VALUE 8000000
118118
VARIABLE_SCOPE GLOBAL
@@ -125,7 +125,7 @@
125125
NUMERIC_BLOCK_SIZE 0
126126
ENUM_VALUE_LIST NULL
127127
READ_ONLY NO
128-
@@ -719,7 +719,7 @@
128+
@@ -719,7 +719,7 @@ VARIABLE_NAME INNODB_FT_MAX_TOKEN_SIZE
129129
SESSION_VALUE NULL
130130
DEFAULT_VALUE 84
131131
VARIABLE_SCOPE GLOBAL
@@ -134,7 +134,7 @@
134134
VARIABLE_COMMENT InnoDB Fulltext search maximum token size in characters
135135
NUMERIC_MIN_VALUE 10
136136
NUMERIC_MAX_VALUE 84
137-
@@ -731,7 +731,7 @@
137+
@@ -731,7 +731,7 @@ VARIABLE_NAME INNODB_FT_MIN_TOKEN_SIZE
138138
SESSION_VALUE NULL
139139
DEFAULT_VALUE 3
140140
VARIABLE_SCOPE GLOBAL
@@ -143,7 +143,7 @@
143143
VARIABLE_COMMENT InnoDB Fulltext search minimum token size in characters
144144
NUMERIC_MIN_VALUE 0
145145
NUMERIC_MAX_VALUE 16
146-
@@ -743,7 +743,7 @@
146+
@@ -743,7 +743,7 @@ VARIABLE_NAME INNODB_FT_NUM_WORD_OPTIMIZE
147147
SESSION_VALUE NULL
148148
DEFAULT_VALUE 2000
149149
VARIABLE_SCOPE GLOBAL
@@ -152,7 +152,7 @@
152152
VARIABLE_COMMENT InnoDB Fulltext search number of words to optimize for each optimize table call
153153
NUMERIC_MIN_VALUE 1000
154154
NUMERIC_MAX_VALUE 10000
155-
@@ -755,10 +755,10 @@
155+
@@ -755,10 +755,10 @@ VARIABLE_NAME INNODB_FT_RESULT_CACHE_LIMIT
156156
SESSION_VALUE NULL
157157
DEFAULT_VALUE 2000000000
158158
VARIABLE_SCOPE GLOBAL
@@ -165,7 +165,7 @@
165165
NUMERIC_BLOCK_SIZE 0
166166
ENUM_VALUE_LIST NULL
167167
READ_ONLY NO
168-
@@ -779,7 +779,7 @@
168+
@@ -779,7 +779,7 @@ VARIABLE_NAME INNODB_FT_SORT_PLL_DEGREE
169169
SESSION_VALUE NULL
170170
DEFAULT_VALUE 2
171171
VARIABLE_SCOPE GLOBAL
@@ -174,7 +174,7 @@
174174
VARIABLE_COMMENT InnoDB Fulltext search parallel sort degree, will round up to nearest power of 2 number
175175
NUMERIC_MIN_VALUE 1
176176
NUMERIC_MAX_VALUE 16
177-
@@ -791,10 +791,10 @@
177+
@@ -791,10 +791,10 @@ VARIABLE_NAME INNODB_FT_TOTAL_CACHE_SIZE
178178
SESSION_VALUE NULL
179179
DEFAULT_VALUE 640000000
180180
VARIABLE_SCOPE GLOBAL
@@ -187,7 +187,7 @@
187187
NUMERIC_BLOCK_SIZE 0
188188
ENUM_VALUE_LIST NULL
189189
READ_ONLY NO
190-
@@ -839,22 +839,22 @@
190+
@@ -839,22 +839,22 @@ VARIABLE_NAME INNODB_IO_CAPACITY
191191
SESSION_VALUE NULL
192192
DEFAULT_VALUE 200
193193
VARIABLE_SCOPE GLOBAL
@@ -300,7 +300,7 @@
300300
VARIABLE_SCOPE GLOBAL
301301
-VARIABLE_TYPE BIGINT UNSIGNED
302302
+VARIABLE_TYPE INT UNSIGNED
303-
VARIABLE_COMMENT Deprecated parameter with no effect
303+
VARIABLE_COMMENT Unused
304304
NUMERIC_MIN_VALUE 1
305305
NUMERIC_MAX_VALUE 128
306306
@@ -1259,7 +1259,7 @@

mysql-test/suite/sys_vars/r/sysvars_innodb.result

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ SESSION_VALUE NULL
204204
DEFAULT_VALUE 0
205205
VARIABLE_SCOPE GLOBAL
206206
VARIABLE_TYPE BIGINT UNSIGNED
207-
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)
207+
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)
208208
NUMERIC_MIN_VALUE 0
209209
NUMERIC_MAX_VALUE 100
210210
NUMERIC_BLOCK_SIZE 0
@@ -504,7 +504,7 @@ SESSION_VALUE NULL
504504
DEFAULT_VALUE OFF
505505
VARIABLE_SCOPE GLOBAL
506506
VARIABLE_TYPE BOOLEAN
507-
VARIABLE_COMMENT Enrypt the temporary table data
507+
VARIABLE_COMMENT Encrypt the temporary table data
508508
NUMERIC_MIN_VALUE NULL
509509
NUMERIC_MAX_VALUE NULL
510510
NUMERIC_BLOCK_SIZE NULL
@@ -1185,10 +1185,10 @@ READ_ONLY YES
11851185
COMMAND_LINE_ARGUMENT OPTIONAL
11861186
VARIABLE_NAME INNODB_PREFIX_INDEX_CLUSTER_OPTIMIZATION
11871187
SESSION_VALUE NULL
1188-
DEFAULT_VALUE ON
1188+
DEFAULT_VALUE OFF
11891189
VARIABLE_SCOPE GLOBAL
11901190
VARIABLE_TYPE BOOLEAN
1191-
VARIABLE_COMMENT Deprecated parameter with no effect
1191+
VARIABLE_COMMENT Unused
11921192
NUMERIC_MIN_VALUE NULL
11931193
NUMERIC_MAX_VALUE NULL
11941194
NUMERIC_BLOCK_SIZE NULL
@@ -1224,7 +1224,7 @@ SESSION_VALUE NULL
12241224
DEFAULT_VALUE 128
12251225
VARIABLE_SCOPE GLOBAL
12261226
VARIABLE_TYPE BIGINT UNSIGNED
1227-
VARIABLE_COMMENT Deprecated parameter with no effect
1227+
VARIABLE_COMMENT Unused
12281228
NUMERIC_MIN_VALUE 1
12291229
NUMERIC_MAX_VALUE 128
12301230
NUMERIC_BLOCK_SIZE 0

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
--- sysvars_server_embedded.result 2024-02-15 09:34:10.105925200 +0100
2-
+++ sysvars_server_embedded,32bit.result 2024-02-15 13:49:05.823558727 +0100
1+
--- a/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result
2+
+++ b/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result
33
@@ -44,7 +44,7 @@
44
COMMAND_LINE_ARGUMENT REQUIRED
55
VARIABLE_NAME ARIA_BLOCK_SIZE
@@ -127,7 +127,7 @@
127127
VARIABLE_SCOPE GLOBAL
128128
-VARIABLE_TYPE BIGINT UNSIGNED
129129
+VARIABLE_TYPE INT UNSIGNED
130-
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
130+
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
131131
NUMERIC_MIN_VALUE 0
132132
NUMERIC_MAX_VALUE 65535
133133
@@ -357,7 +357,7 @@
@@ -193,7 +193,7 @@
193193
READ_ONLY NO
194194
@@ -527,7 +527,7 @@
195195
VARIABLE_TYPE BIGINT UNSIGNED
196-
VARIABLE_COMMENT Size of tree cache used in bulk insert optimisation. Note that this is a limit per thread!
196+
VARIABLE_COMMENT Size of tree cache used in bulk insert optimization. Note that this is a limit per thread
197197
NUMERIC_MIN_VALUE 0
198198
-NUMERIC_MAX_VALUE 18446744073709551615
199199
+NUMERIC_MAX_VALUE 4294967295
@@ -206,7 +206,7 @@
206206
VARIABLE_SCOPE GLOBAL
207207
-VARIABLE_TYPE BIGINT UNSIGNED
208208
+VARIABLE_TYPE INT UNSIGNED
209-
VARIABLE_COMMENT The number of seconds the mysqld server is waiting for a connect packet before responding with 'Bad handshake'
209+
VARIABLE_COMMENT The number of seconds the MariaDB server is waiting for a connect packet before responding with 'Bad handshake'
210210
NUMERIC_MIN_VALUE 2
211211
NUMERIC_MAX_VALUE 31536000
212212
@@ -754,7 +754,7 @@
@@ -382,7 +382,7 @@
382382
NUMERIC_MAX_VALUE 8
383383
@@ -1467,7 +1467,7 @@
384384
VARIABLE_TYPE BIGINT UNSIGNED
385-
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
385+
VARIABLE_COMMENT The size of the buffer used for index blocks for MyISAM tables. Increase this to get faster index handling
386386
NUMERIC_MIN_VALUE 0
387387
-NUMERIC_MAX_VALUE 18446744073709551615
388388
+NUMERIC_MAX_VALUE 4294967295
@@ -431,7 +431,7 @@
431431
VARIABLE_SCOPE SESSION
432432
-VARIABLE_TYPE BIGINT UNSIGNED
433433
+VARIABLE_TYPE INT UNSIGNED
434-
VARIABLE_COMMENT Log some non critical warnings to the error log.Value can be between 0 and 11. Higher values mean more verbosity
434+
VARIABLE_COMMENT Log some non-critical warnings to the error log. Value can be between 0 and 11. Higher values mean more verbosity
435435
NUMERIC_MIN_VALUE 0
436436
NUMERIC_MAX_VALUE 4294967295
437437
@@ -1874,7 +1874,7 @@
@@ -640,7 +640,7 @@
640640
NUMERIC_MAX_VALUE 7
641641
@@ -2197,7 +2197,7 @@
642642
VARIABLE_TYPE BIGINT UNSIGNED
643-
VARIABLE_COMMENT Restricts the total memory used for memory mapping of MySQL tables
643+
VARIABLE_COMMENT Restricts the total memory used for memory mapping of MyISAM tables
644644
NUMERIC_MIN_VALUE 7
645645
-NUMERIC_MAX_VALUE 18446744073709551615
646646
+NUMERIC_MAX_VALUE 4294967295
@@ -711,7 +711,7 @@
711711
VARIABLE_SCOPE GLOBAL
712712
-VARIABLE_TYPE BIGINT UNSIGNED
713713
+VARIABLE_TYPE INT UNSIGNED
714-
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
714+
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
715715
NUMERIC_MIN_VALUE 0
716716
NUMERIC_MAX_VALUE 4294967295
717717
@@ -2354,7 +2354,7 @@
@@ -795,7 +795,7 @@
795795
VARIABLE_SCOPE SESSION
796796
-VARIABLE_TYPE BIGINT UNSIGNED
797797
+VARIABLE_TYPE INT UNSIGNED
798-
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
798+
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
799799
NUMERIC_MIN_VALUE 1
800800
NUMERIC_MAX_VALUE 5
801801
@@ -2614,7 +2614,7 @@

0 commit comments

Comments
 (0)