Commit 3e20a42b authored by Sergey Vojtovich's avatar Sergey Vojtovich

MDEV-8579 - Some sysvars in I_S are missing any meaningful help (comment) text

Follow-up to original patch: fixing test cases.
parent f066c89a
--- mysqld--help.result --- mysqld--help.result
+++ mysqld--help,win.reject +++ mysqld--help,win.reject
@@ -321,7 +321,6 @@ The following options may be given as the first argument: @@ -333,7 +333,6 @@
The number of segments in a key cache The number of segments in a key cache
-L, --language=name Client error messages in given language. May be given as -L, --language=name Client error messages in given language. May be given as
a full path. Deprecated. Use --lc-messages-dir instead. a full path. Deprecated. Use --lc-messages-dir instead.
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
--lc-messages=name Set the language used for the error messages. --lc-messages=name Set the language used for the error messages.
-L, --lc-messages-dir=name -L, --lc-messages-dir=name
Directory where error messages are Directory where error messages are
@@ -517,6 +516,7 @@ The following options may be given as the first argument: @@ -533,6 +532,7 @@
Use MySQL-5.6 (instead of MariaDB-5.3) format for TIME, Use MySQL-5.6 (instead of MariaDB-5.3) format for TIME,
DATETIME, TIMESTAMP columns. DATETIME, TIMESTAMP columns.
(Defaults to on; use --skip-mysql56-temporal-format to disable.) (Defaults to on; use --skip-mysql56-temporal-format to disable.)
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
--net-buffer-length=# --net-buffer-length=#
Buffer length for TCP/IP and socket communication Buffer length for TCP/IP and socket communication
--net-read-timeout=# --net-read-timeout=#
@@ -906,6 +906,9 @@ The following options may be given as the first argument: @@ -924,6 +924,9 @@
files within specified directory files within specified directory
--server-id=# Uniquely identifies the server instance in the community --server-id=# Uniquely identifies the server instance in the community
of replication partners of replication partners
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
--show-slave-auth-info --show-slave-auth-info
Show user and password in SHOW SLAVE HOSTS on this Show user and password in SHOW SLAVE HOSTS on this
master. master.
@@ -1016,6 +1019,10 @@ The following options may be given as the first argument: @@ -1034,6 +1037,10 @@
Log slow queries to given log file. Defaults logging to Log slow queries to given log file. Defaults logging to
'hostname'-slow.log. Must be enabled to activate other 'hostname'-slow.log. Must be enabled to activate other
slow log options slow log options
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
--socket=name Socket file to use for connection --socket=name Socket file to use for connection
--sort-buffer-size=# --sort-buffer-size=#
Each thread that needs to do a sort allocates a buffer of Each thread that needs to do a sort allocates a buffer of
@@ -1034,6 +1041,7 @@ The following options may be given as the first argument: @@ -1052,6 +1059,7 @@
NO_ENGINE_SUBSTITUTION, PAD_CHAR_TO_FULL_LENGTH NO_ENGINE_SUBSTITUTION, PAD_CHAR_TO_FULL_LENGTH
--stack-trace Print a symbolic stack trace on failure --stack-trace Print a symbolic stack trace on failure
(Defaults to on; use --skip-stack-trace to disable.) (Defaults to on; use --skip-stack-trace to disable.)
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
--stored-program-cache=# --stored-program-cache=#
The soft upper limit for number of cached stored routines The soft upper limit for number of cached stored routines
for one connection. for one connection.
@@ -1070,25 +1078,11 @@ The following options may be given as the first argument: @@ -1088,25 +1096,11 @@
COMMIT, ROLLBACK COMMIT, ROLLBACK
--thread-cache-size=# --thread-cache-size=#
How many threads we should keep in a cache for reuse How many threads we should keep in a cache for reuse
...@@ -73,9 +73,9 @@ ...@@ -73,9 +73,9 @@
--thread-stack=# The stack size for each thread --thread-stack=# The stack size for each thread
--time-format=name The TIME format (ignored) --time-format=name The TIME format (ignored)
--timed-mutexes Specify whether to time mutexes. Deprecated, has no --timed-mutexes Specify whether to time mutexes. Deprecated, has no
@@ -1097,8 +1091,8 @@ The following options may be given as the first argument: @@ -1115,8 +1109,8 @@
size, MySQL will automatically convert it to an on-disk size, MariaDB will automatically convert it to an on-disk
MyISAM or Aria table MyISAM or Aria table.
-t, --tmpdir=name Path for temporary files. Several paths may be specified, -t, --tmpdir=name Path for temporary files. Several paths may be specified,
- separated by a colon (:), in this case they are used in a - separated by a colon (:), in this case they are used in a
- round-robin fashion - round-robin fashion
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
--transaction-alloc-block-size=# --transaction-alloc-block-size=#
Allocation block size for transactions to be stored in Allocation block size for transactions to be stored in
binary log binary log
@@ -1224,7 +1218,6 @@ key-cache-block-size 1024 @@ -1240,7 +1234,6 @@
key-cache-division-limit 100 key-cache-division-limit 100
key-cache-file-hash-size 512 key-cache-file-hash-size 512
key-cache-segments 0 key-cache-segments 0
...@@ -92,7 +92,7 @@ ...@@ -92,7 +92,7 @@
lc-messages en_US lc-messages en_US
lc-messages-dir MYSQL_SHAREDIR/ lc-messages-dir MYSQL_SHAREDIR/
lc-time-names en_US lc-time-names en_US
@@ -1290,6 +1283,7 @@ myisam-sort-buffer-size 134216704 @@ -1307,6 +1300,7 @@
myisam-stats-method NULLS_UNEQUAL myisam-stats-method NULLS_UNEQUAL
myisam-use-mmap FALSE myisam-use-mmap FALSE
mysql56-temporal-format TRUE mysql56-temporal-format TRUE
...@@ -100,7 +100,7 @@ ...@@ -100,7 +100,7 @@
net-buffer-length 16384 net-buffer-length 16384
net-read-timeout 30 net-read-timeout 30
net-retry-count 10 net-retry-count 10
@@ -1386,6 +1380,8 @@ safe-user-create FALSE @@ -1403,6 +1397,8 @@
secure-auth TRUE secure-auth TRUE
secure-file-priv (No default value) secure-file-priv (No default value)
server-id 0 server-id 0
...@@ -109,7 +109,7 @@ ...@@ -109,7 +109,7 @@
show-slave-auth-info FALSE show-slave-auth-info FALSE
silent-startup FALSE silent-startup FALSE
skip-grant-tables TRUE skip-grant-tables TRUE
@@ -1409,6 +1405,7 @@ slave-transaction-retries 10 @@ -1426,6 +1422,7 @@
slave-type-conversions slave-type-conversions
slow-launch-time 2 slow-launch-time 2
slow-query-log FALSE slow-query-log FALSE
...@@ -117,7 +117,7 @@ ...@@ -117,7 +117,7 @@
sort-buffer-size 2097152 sort-buffer-size 2097152
sql-mode NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION sql-mode NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION
stack-trace TRUE stack-trace TRUE
@@ -1421,15 +1418,13 @@ sync-master-info 10000 @@ -1438,15 +1435,13 @@
sync-relay-log 10000 sync-relay-log 10000
sync-relay-log-info 10000 sync-relay-log-info 10000
sysdate-is-now FALSE sysdate-is-now FALSE
......
Windows bug: happens when a new line is exactly at the right offset Windows bug: happens when a new line is exactly at the right offset.
The following options may be given as the first argument: The following options may be given as the first argument:
--print-defaults Print the program argument list and exit. --print-defaults Print the program argument list and exit.
--no-defaults Don't read default options from any option file. --no-defaults Don't read default options from any option file.
...@@ -23,13 +23,15 @@ The following options may be given as the first argument: ...@@ -23,13 +23,15 @@ The following options may be given as the first argument:
Creating and dropping stored procedures alters ACLs Creating and dropping stored procedures alters ACLs
(Defaults to on; use --skip-automatic-sp-privileges to disable.) (Defaults to on; use --skip-automatic-sp-privileges to disable.)
--back-log=# The number of outstanding connection requests MariaDB can --back-log=# The number of outstanding connection requests MariaDB can
have. This comes into play when the main MySQL thread have. This comes into play when the main MariaDB thread
gets very many connection requests in a very short time gets very many connection requests in a very short time
(Automatically configured unless set explicitly) (Automatically configured unless set explicitly)
-b, --basedir=name Path to installation directory. All paths are usually -b, --basedir=name Path to installation directory. All paths are usually
resolved relative to this resolved relative to this
--big-tables Allow big result sets by saving all temporary sets on --big-tables Old variable, which if set to 1, allows large result sets
file (Solves most 'table full' errors) by saving all temporary sets to disk, avoiding 'table
full' errors. No longer needed, as the server now handles
this automatically. sql_big_tables is a synonym.
--bind-address=name IP address to bind to. --bind-address=name IP address to bind to.
--binlog-annotate-row-events --binlog-annotate-row-events
Tells the master to annotate RBR events with the Tells the master to annotate RBR events with the
...@@ -104,7 +106,7 @@ The following options may be given as the first argument: ...@@ -104,7 +106,7 @@ The following options may be given as the first argument:
The size of the statement cache for updates to The size of the statement cache for updates to
non-transactional engines for the binary log. If you non-transactional engines for the binary log. If you
often use statements updating a great number of rows, you often use statements updating a great number of rows, you
can increase this to get more performance can increase this to get more performance.
--bootstrap Used by mysql installation scripts. --bootstrap Used by mysql installation scripts.
--bulk-insert-buffer-size=# --bulk-insert-buffer-size=#
Size of tree cache used in bulk insert optimisation. Note Size of tree cache used in bulk insert optimisation. Note
...@@ -161,12 +163,21 @@ The following options may be given as the first argument: ...@@ -161,12 +163,21 @@ The following options may be given as the first argument:
--default-week-format=# --default-week-format=#
The default week format used by WEEK() functions The default week format used by WEEK() functions
--delay-key-write[=name] --delay-key-write[=name]
Type of DELAY_KEY_WRITE. One of: OFF, ON, ALL Specifies how MyISAM tables handles CREATE TABLE
DELAY_KEY_WRITE. If set to ON, the default, any DELAY KEY
WRITEs are honored. The key buffer is then flushed only
when the table closes, speeding up writes. MyISAM tables
should be automatically checked upon startup in this
case, and --external locking should not be used, as it
can lead to index corruption. If set to OFF, DELAY KEY
WRITEs are ignored, while if set to ALL, all new opened
tables are treated as if created with DELAY KEY WRITEs
enabled.
--delayed-insert-limit=# --delayed-insert-limit=#
After inserting delayed_insert_limit rows, the INSERT After inserting delayed_insert_limit rows, the INSERT
DELAYED handler will check if there are any SELECT DELAYED handler will check if there are any SELECT
statements pending. If so, it allows these to execute statements pending. If so, it allows these to execute
before continuing before continuing.
--delayed-insert-timeout=# --delayed-insert-timeout=#
How long a INSERT DELAYED thread should wait for INSERT How long a INSERT DELAYED thread should wait for INSERT
statements before terminating statements before terminating
...@@ -231,7 +242,7 @@ The following options may be given as the first argument: ...@@ -231,7 +242,7 @@ The following options may be given as the first argument:
--gdb Set up signals usable for debugging. Deprecated, use --gdb Set up signals usable for debugging. Deprecated, use
--general-log Log connections and queries to a table or log file. --general-log Log connections and queries to a table or log file.
Defaults logging to a file 'hostname'.log or a table Defaults logging to a file 'hostname'.log or a table
mysql.general_logif --log-output=TABLE is used mysql.general_logif --log-output=TABLE is used.
--general-log-file=name --general-log-file=name
Log connections and queries to given file Log connections and queries to given file
--getopt-prefix-matching --getopt-prefix-matching
...@@ -372,7 +383,7 @@ The following options may be given as the first argument: ...@@ -372,7 +383,7 @@ The following options may be given as the first argument:
logs. logs.
--log-slave-updates Tells the slave to log the updates from the slave thread --log-slave-updates Tells the slave to log the updates from the slave thread
to the binary log. You will need to turn it on if you to the binary log. You will need to turn it on if you
plan to daisy-chain the slaves plan to daisy-chain the slaves.
--log-slow-admin-statements --log-slow-admin-statements
Log slow OPTIMIZE, ANALYZE, ALTER and other Log slow OPTIMIZE, ANALYZE, ALTER and other
administrative statements to the slow log if it is open. administrative statements to the slow log if it is open.
...@@ -567,7 +578,7 @@ The following options may be given as the first argument: ...@@ -567,7 +578,7 @@ The following options may be given as the first argument:
automatically pick a reasonable value; if set to 63, the automatically pick a reasonable value; if set to 63, the
optimizer will switch to the original find_best search. optimizer will switch to the original find_best search.
NOTE: The value 63 and its associated behaviour is NOTE: The value 63 and its associated behaviour is
deprecated deprecated.
--optimizer-selectivity-sampling-limit=# --optimizer-selectivity-sampling-limit=#
Controls number of record samples to check condition Controls number of record samples to check condition
selectivity selectivity
...@@ -754,7 +765,9 @@ The following options may be given as the first argument: ...@@ -754,7 +765,9 @@ The following options may be given as the first argument:
The size of the buffer that is allocated when preloading The size of the buffer that is allocated when preloading
indexes indexes
--profiling-history-size=# --profiling-history-size=#
Limit of query profiling memory Number of statements about which profiling information is
maintained. If set to 0, no profiles are stored. See SHOW
PROFILES.
--progress-report-time=# --progress-report-time=#
Seconds between sending progress reports to the client Seconds between sending progress reports to the client
for time-consuming statements. Set to 0 to disable for time-consuming statements. Set to 0 to disable
...@@ -792,21 +805,21 @@ The following options may be given as the first argument: ...@@ -792,21 +805,21 @@ The following options may be given as the first argument:
--read-rnd-buffer-size=# --read-rnd-buffer-size=#
When reading rows in sorted order after a sort, the rows When reading rows in sorted order after a sort, the rows
are read through this buffer to avoid a disk seeks are read through this buffer to avoid a disk seeks
--relay-log=name The location and name to use for relay logs --relay-log=name The location and name to use for relay logs.
--relay-log-index=name --relay-log-index=name
The location and name to use for the file that keeps a The location and name to use for the file that keeps a
list of the last relay logs list of the last relay logs
--relay-log-info-file=name --relay-log-info-file=name
The location and name of the file that remembers where The location and name of the file that remembers where
the SQL replication thread is in the relay logs the SQL replication thread is in the relay logs.
--relay-log-purge if disabled - do not purge relay logs. if enabled - purge --relay-log-purge if disabled - do not purge relay logs. if enabled - purge
them as soon as they are no more needed them as soon as they are no more needed.
(Defaults to on; use --skip-relay-log-purge to disable.) (Defaults to on; use --skip-relay-log-purge to disable.)
--relay-log-recovery --relay-log-recovery
Enables automatic relay log recovery right after the Enables automatic relay log recovery right after the
database startup, which means that the IO Thread starts database startup, which means that the IO Thread starts
re-fetching from the master right after the last re-fetching from the master right after the last
transaction processed transaction processed.
--relay-log-space-limit=# --relay-log-space-limit=#
Maximum space to use for all relay logs Maximum space to use for all relay logs
--replicate-annotate-row-events --replicate-annotate-row-events
...@@ -950,7 +963,7 @@ The following options may be given as the first argument: ...@@ -950,7 +963,7 @@ The following options may be given as the first argument:
idempotent. For example, in row based replication idempotent. For example, in row based replication
attempts to delete rows that doesn't exist will be attempts to delete rows that doesn't exist will be
ignored. In STRICT mode, replication will stop on any ignored. In STRICT mode, replication will stop on any
unexpected difference between the master and the slave unexpected difference between the master and the slave.
--slave-load-tmpdir=name --slave-load-tmpdir=name
The location where the slave should put its temporary The location where the slave should put its temporary
files when replicating a LOAD DATA INFILE command files when replicating a LOAD DATA INFILE command
...@@ -1016,7 +1029,7 @@ The following options may be given as the first argument: ...@@ -1016,7 +1029,7 @@ The following options may be given as the first argument:
--slow-query-log Log slow queries to a table or log file. Defaults logging --slow-query-log Log slow queries to a table or log file. Defaults logging
to a file 'hostname'-slow.log or a table mysql.slow_log to a file 'hostname'-slow.log or a table mysql.slow_log
if --log-output=TABLE is used. Must be enabled to if --log-output=TABLE is used. Must be enabled to
activate other slow log options activate other slow log options.
--slow-query-log-file=name --slow-query-log-file=name
Log slow queries to given log file. Defaults logging to Log slow queries to given log file. Defaults logging to
'hostname'-slow.log. Must be enabled to activate other 'hostname'-slow.log. Must be enabled to activate other
...@@ -1099,8 +1112,8 @@ The following options may be given as the first argument: ...@@ -1099,8 +1112,8 @@ The following options may be given as the first argument:
--timed-mutexes Specify whether to time mutexes. Deprecated, has no --timed-mutexes Specify whether to time mutexes. Deprecated, has no
effect. effect.
--tmp-table-size=# If an internal in-memory temporary table exceeds this --tmp-table-size=# If an internal in-memory temporary table exceeds this
size, MySQL will automatically convert it to an on-disk size, MariaDB will automatically convert it to an on-disk
MyISAM or Aria table MyISAM or Aria table.
-t, --tmpdir=name Path for temporary files. Several paths may be specified, -t, --tmpdir=name Path for temporary files. Several paths may be specified,
separated by a colon (:), in this case they are used in a separated by a colon (:), in this case they are used in a
round-robin fashion round-robin fashion
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
VARIABLE_SCOPE GLOBAL VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT UNSIGNED -VARIABLE_TYPE BIGINT UNSIGNED
+VARIABLE_TYPE INT UNSIGNED +VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT The number of outstanding connection requests MariaDB can have. This comes into play when the main MySQL 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 very many connection requests in a very short time
NUMERIC_MIN_VALUE 0 NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 65535 NUMERIC_MAX_VALUE 65535
@@ -144,7 +144,7 @@ @@ -144,7 +144,7 @@
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
READ_ONLY NO READ_ONLY NO
@@ -256,7 +256,7 @@ @@ -256,7 +256,7 @@
VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_TYPE BIGINT UNSIGNED
VARIABLE_COMMENT The size of the statement cache for updates to non-transactional engines for the binary log. If you often use statements updating a great number of rows, you can increase this to get more performance VARIABLE_COMMENT The size of the statement cache for updates to non-transactional engines for the binary log. If you often use statements updating a great number of rows, you can increase this to get more performance.
NUMERIC_MIN_VALUE 4096 NUMERIC_MIN_VALUE 4096
-NUMERIC_MAX_VALUE 18446744073709551615 -NUMERIC_MAX_VALUE 18446744073709551615
+NUMERIC_MAX_VALUE 4294967295 +NUMERIC_MAX_VALUE 4294967295
...@@ -140,7 +140,7 @@ ...@@ -140,7 +140,7 @@
VARIABLE_SCOPE GLOBAL VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT UNSIGNED -VARIABLE_TYPE BIGINT UNSIGNED
+VARIABLE_TYPE INT UNSIGNED +VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT After inserting delayed_insert_limit rows, the INSERT DELAYED handler will check if there are any SELECT statements pending. If so, it allows these to execute before continuing VARIABLE_COMMENT After inserting delayed_insert_limit rows, the INSERT DELAYED handler will check if there are any SELECT statements pending. If so, it allows these to execute before continuing.
NUMERIC_MIN_VALUE 1 NUMERIC_MIN_VALUE 1
NUMERIC_MAX_VALUE 4294967295 NUMERIC_MAX_VALUE 4294967295
@@ -645,7 +645,7 @@ @@ -645,7 +645,7 @@
...@@ -458,7 +458,7 @@ ...@@ -458,7 +458,7 @@
VARIABLE_COMMENT Limit assumed max number of seeks when looking up rows based on a key VARIABLE_COMMENT Limit assumed max number of seeks when looking up rows based on a key
NUMERIC_MIN_VALUE 1 NUMERIC_MIN_VALUE 1
NUMERIC_MAX_VALUE 4294967295 NUMERIC_MAX_VALUE 4294967295
@@ -2003,7 +2003,7 @@ @@ -2017,7 +2017,7 @@
GLOBAL_VALUE_ORIGIN COMPILE-TIME GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE 1024 DEFAULT_VALUE 1024
VARIABLE_SCOPE SESSION VARIABLE_SCOPE SESSION
...@@ -467,7 +467,7 @@ ...@@ -467,7 +467,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) 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 4 NUMERIC_MIN_VALUE 4
NUMERIC_MAX_VALUE 8388608 NUMERIC_MAX_VALUE 8388608
@@ -2017,7 +2017,7 @@ @@ -2031,7 +2031,7 @@
GLOBAL_VALUE_ORIGIN COMPILE-TIME GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE 0 DEFAULT_VALUE 0
VARIABLE_SCOPE SESSION VARIABLE_SCOPE SESSION
...@@ -664,7 +664,7 @@ ...@@ -664,7 +664,7 @@
VARIABLE_SCOPE SESSION VARIABLE_SCOPE SESSION
-VARIABLE_TYPE BIGINT UNSIGNED -VARIABLE_TYPE BIGINT UNSIGNED
+VARIABLE_TYPE INT UNSIGNED +VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT Maximum depth of search performed by the query optimizer. Values larger than the number of relations in a query result in better query plans, but take longer to compile a query. Values smaller than the number of tables in a relation result in faster optimization, but may produce very bad query plans. If set to 0, the system will automatically pick a reasonable value; if set to 63, the optimizer will switch to the original find_best search. NOTE: The value 63 and its associated behaviour is deprecated 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; if set to 63, the optimizer will switch to the original find_best search. NOTE: The value 63 and its associated behaviour is deprecated.
NUMERIC_MIN_VALUE 0 NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 63 NUMERIC_MAX_VALUE 63
@@ -2451,7 +2451,7 @@ @@ -2451,7 +2451,7 @@
...@@ -979,7 +979,7 @@ ...@@ -979,7 +979,7 @@
VARIABLE_SCOPE SESSION VARIABLE_SCOPE SESSION
-VARIABLE_TYPE BIGINT UNSIGNED -VARIABLE_TYPE BIGINT UNSIGNED
+VARIABLE_TYPE INT UNSIGNED +VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT Limit of query profiling memory 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_MIN_VALUE 0
NUMERIC_MAX_VALUE 100 NUMERIC_MAX_VALUE 100
@@ -3039,7 +3039,7 @@ @@ -3039,7 +3039,7 @@
...@@ -1172,7 +1172,7 @@ ...@@ -1172,7 +1172,7 @@
NUMERIC_MAX_VALUE 512 NUMERIC_MAX_VALUE 512
@@ -3994,7 +3994,7 @@ @@ -3994,7 +3994,7 @@
VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_TYPE BIGINT UNSIGNED
VARIABLE_COMMENT If an internal in-memory temporary table exceeds this size, MySQL will automatically convert it to an on-disk MyISAM or Aria table 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.
NUMERIC_MIN_VALUE 1024 NUMERIC_MIN_VALUE 1024
-NUMERIC_MAX_VALUE 18446744073709551615 -NUMERIC_MAX_VALUE 18446744073709551615
+NUMERIC_MAX_VALUE 4294967295 +NUMERIC_MAX_VALUE 4294967295
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
VARIABLE_SCOPE GLOBAL VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT UNSIGNED -VARIABLE_TYPE BIGINT UNSIGNED
+VARIABLE_TYPE INT UNSIGNED +VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT The number of outstanding connection requests MariaDB can have. This comes into play when the main MySQL 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 very many connection requests in a very short time
NUMERIC_MIN_VALUE 0 NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 65535 NUMERIC_MAX_VALUE 65535
@@ -144,7 +144,7 @@ @@ -144,7 +144,7 @@
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
READ_ONLY NO READ_ONLY NO
@@ -256,7 +256,7 @@ @@ -256,7 +256,7 @@
VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_TYPE BIGINT UNSIGNED
VARIABLE_COMMENT The size of the statement cache for updates to non-transactional engines for the binary log. If you often use statements updating a great number of rows, you can increase this to get more performance VARIABLE_COMMENT The size of the statement cache for updates to non-transactional engines for the binary log. If you often use statements updating a great number of rows, you can increase this to get more performance.
NUMERIC_MIN_VALUE 4096 NUMERIC_MIN_VALUE 4096
-NUMERIC_MAX_VALUE 18446744073709551615 -NUMERIC_MAX_VALUE 18446744073709551615
+NUMERIC_MAX_VALUE 4294967295 +NUMERIC_MAX_VALUE 4294967295
...@@ -140,7 +140,7 @@ ...@@ -140,7 +140,7 @@
VARIABLE_SCOPE GLOBAL VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT UNSIGNED -VARIABLE_TYPE BIGINT UNSIGNED
+VARIABLE_TYPE INT UNSIGNED +VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT After inserting delayed_insert_limit rows, the INSERT DELAYED handler will check if there are any SELECT statements pending. If so, it allows these to execute before continuing VARIABLE_COMMENT After inserting delayed_insert_limit rows, the INSERT DELAYED handler will check if there are any SELECT statements pending. If so, it allows these to execute before continuing.
NUMERIC_MIN_VALUE 1 NUMERIC_MIN_VALUE 1
NUMERIC_MAX_VALUE 4294967295 NUMERIC_MAX_VALUE 4294967295
@@ -659,7 +659,7 @@ @@ -659,7 +659,7 @@
...@@ -458,7 +458,7 @@ ...@@ -458,7 +458,7 @@
VARIABLE_COMMENT Limit assumed max number of seeks when looking up rows based on a key VARIABLE_COMMENT Limit assumed max number of seeks when looking up rows based on a key
NUMERIC_MIN_VALUE 1 NUMERIC_MIN_VALUE 1
NUMERIC_MAX_VALUE 4294967295 NUMERIC_MAX_VALUE 4294967295
@@ -2199,7 +2199,7 @@ @@ -2213,7 +2213,7 @@
GLOBAL_VALUE_ORIGIN COMPILE-TIME GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE 1024 DEFAULT_VALUE 1024
VARIABLE_SCOPE SESSION VARIABLE_SCOPE SESSION
...@@ -467,7 +467,7 @@ ...@@ -467,7 +467,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) 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 4 NUMERIC_MIN_VALUE 4
NUMERIC_MAX_VALUE 8388608 NUMERIC_MAX_VALUE 8388608
@@ -2213,7 +2213,7 @@ @@ -2227,7 +2227,7 @@
GLOBAL_VALUE_ORIGIN COMPILE-TIME GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE 0 DEFAULT_VALUE 0
VARIABLE_SCOPE SESSION VARIABLE_SCOPE SESSION
...@@ -664,7 +664,7 @@ ...@@ -664,7 +664,7 @@
VARIABLE_SCOPE SESSION VARIABLE_SCOPE SESSION
-VARIABLE_TYPE BIGINT UNSIGNED -VARIABLE_TYPE BIGINT UNSIGNED
+VARIABLE_TYPE INT UNSIGNED +VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT Maximum depth of search performed by the query optimizer. Values larger than the number of relations in a query result in better query plans, but take longer to compile a query. Values smaller than the number of tables in a relation result in faster optimization, but may produce very bad query plans. If set to 0, the system will automatically pick a reasonable value; if set to 63, the optimizer will switch to the original find_best search. NOTE: The value 63 and its associated behaviour is deprecated 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; if set to 63, the optimizer will switch to the original find_best search. NOTE: The value 63 and its associated behaviour is deprecated.
NUMERIC_MIN_VALUE 0 NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 63 NUMERIC_MAX_VALUE 63
@@ -2647,7 +2647,7 @@ @@ -2647,7 +2647,7 @@
...@@ -979,7 +979,7 @@ ...@@ -979,7 +979,7 @@
VARIABLE_SCOPE SESSION VARIABLE_SCOPE SESSION
-VARIABLE_TYPE BIGINT UNSIGNED -VARIABLE_TYPE BIGINT UNSIGNED
+VARIABLE_TYPE INT UNSIGNED +VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT Limit of query profiling memory 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_MIN_VALUE 0
NUMERIC_MAX_VALUE 100 NUMERIC_MAX_VALUE 100
@@ -3235,7 +3235,7 @@ @@ -3235,7 +3235,7 @@
...@@ -1208,7 +1208,7 @@ ...@@ -1208,7 +1208,7 @@
NUMERIC_MAX_VALUE 512 NUMERIC_MAX_VALUE 512
@@ -4764,7 +4764,7 @@ @@ -4764,7 +4764,7 @@
VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_TYPE BIGINT UNSIGNED
VARIABLE_COMMENT If an internal in-memory temporary table exceeds this size, MySQL will automatically convert it to an on-disk MyISAM or Aria table 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.
NUMERIC_MIN_VALUE 1024 NUMERIC_MIN_VALUE 1024
-NUMERIC_MAX_VALUE 18446744073709551615 -NUMERIC_MAX_VALUE 18446744073709551615
+NUMERIC_MAX_VALUE 4294967295 +NUMERIC_MAX_VALUE 4294967295
......
...@@ -288,7 +288,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME ...@@ -288,7 +288,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE DEFAULT_VALUE
VARIABLE_SCOPE GLOBAL VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE VARCHAR VARIABLE_TYPE VARCHAR
VARIABLE_COMMENT Node address VARIABLE_COMMENT Specifies the node's network address, in the format ip address[:port]. Used in situations where autoguessing is not reliable. As of MariaDB 10.1.8, supports IPv6.
NUMERIC_MIN_VALUE NULL NUMERIC_MIN_VALUE NULL
NUMERIC_MAX_VALUE NULL NUMERIC_MAX_VALUE NULL
NUMERIC_BLOCK_SIZE NULL NUMERIC_BLOCK_SIZE NULL
...@@ -316,7 +316,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME ...@@ -316,7 +316,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE HOSTNAME DEFAULT_VALUE HOSTNAME
VARIABLE_SCOPE GLOBAL VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE VARCHAR VARIABLE_TYPE VARCHAR
VARIABLE_COMMENT Node name VARIABLE_COMMENT Name of this node. This name can be used in wsrep_sst_donor as a preferred donor. Note that multiple nodes in a cluster can have the same name.
NUMERIC_MIN_VALUE NULL NUMERIC_MIN_VALUE NULL
NUMERIC_MAX_VALUE NULL NUMERIC_MAX_VALUE NULL
NUMERIC_BLOCK_SIZE NULL NUMERIC_BLOCK_SIZE NULL
...@@ -372,7 +372,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME ...@@ -372,7 +372,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE NULL DEFAULT_VALUE NULL
VARIABLE_SCOPE GLOBAL VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE VARCHAR VARIABLE_TYPE VARCHAR
VARIABLE_COMMENT wsrep patch version VARIABLE_COMMENT Wsrep patch version, for example wsrep_MAJVER.MINVER.
NUMERIC_MIN_VALUE NULL NUMERIC_MIN_VALUE NULL
NUMERIC_MAX_VALUE NULL NUMERIC_MAX_VALUE NULL
NUMERIC_BLOCK_SIZE NULL NUMERIC_BLOCK_SIZE NULL
...@@ -400,7 +400,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME ...@@ -400,7 +400,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE DEFAULT_VALUE
VARIABLE_SCOPE GLOBAL VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE VARCHAR VARIABLE_TYPE VARCHAR
VARIABLE_COMMENT provider specific options VARIABLE_COMMENT Semicolon (;) separated list of wsrep options (see wsrep_provider_options documentation).
NUMERIC_MIN_VALUE NULL NUMERIC_MIN_VALUE NULL
NUMERIC_MAX_VALUE NULL NUMERIC_MAX_VALUE NULL
NUMERIC_BLOCK_SIZE NULL NUMERIC_BLOCK_SIZE NULL
...@@ -442,7 +442,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME ...@@ -442,7 +442,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE OFF DEFAULT_VALUE OFF
VARIABLE_SCOPE GLOBAL VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE BOOLEAN VARIABLE_TYPE BOOLEAN
VARIABLE_COMMENT Should MySQL slave be restarted automatically, when node joins back to cluster VARIABLE_COMMENT Should MariaDB slave be restarted automatically, when node joins back to cluster
NUMERIC_MIN_VALUE NULL NUMERIC_MIN_VALUE NULL
NUMERIC_MAX_VALUE NULL NUMERIC_MAX_VALUE NULL
NUMERIC_BLOCK_SIZE NULL NUMERIC_BLOCK_SIZE NULL
......
...@@ -42,7 +42,7 @@ perl; ...@@ -42,7 +42,7 @@ perl;
$re2=join('|', @plugins); $re2=join('|', @plugins);
$skip=0; $skip=0;
open(F, '<', "$ENV{MYSQL_TMP_DIR}/mysqld--help.txt") or die; open(F, '<', "$ENV{MYSQL_TMP_DIR}/mysqld--help.txt") or die;
print "Windows bug: happens when a new line is exactly at the right offset\n"; print "Windows bug: happens when a new line is exactly at the right offset.\n";
while (<F>) { while (<F>) {
next if 1../The following groups are read/; next if 1../The following groups are read/;
# formatting, skip line consisting entirely of dashes and blanks # formatting, skip line consisting entirely of dashes and blanks
......
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