fix rdiff files in sys_var suite

This commit is contained in:
Sergei Golubchik 2024-10-18 14:05:29 +02:00
parent 15a291e4e0
commit 128fc34990
5 changed files with 489 additions and 489 deletions

View file

@ -1,6 +1,6 @@
--- 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
@@ -48,7 +48,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 @@ VARIABLE_NAME INNODB_AUTOINC_LOCK_MODE
@@ -84,7 +84,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 @@ VARIABLE_NAME INNODB_BUFFER_POOL_CHUNK_SIZE
@@ -96,10 +96,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 @@ VARIABLE_NAME INNODB_BUFFER_POOL_DUMP_PCT
@@ -132,7 +132,7 @@ VARIABLE_NAME INNODB_BUFFER_POOL_DUMP_PCT
SESSION_VALUE NULL
DEFAULT_VALUE 25
VARIABLE_SCOPE GLOBAL
@ -40,7 +40,7 @@
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 @@ VARIABLE_NAME INNODB_BUF_DUMP_STATUS_FREQUENCY
@@ -216,7 +216,7 @@ VARIABLE_NAME INNODB_BUF_DUMP_STATUS_FREQUENCY
SESSION_VALUE NULL
DEFAULT_VALUE 0
VARIABLE_SCOPE GLOBAL
@ -49,7 +49,7 @@
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 @@ VARIABLE_NAME INNODB_COMPRESSION_FAILURE_THRESHOLD_PCT
@@ -288,7 +288,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 @@ VARIABLE_NAME INNODB_COMPRESSION_PAD_PCT_MAX
@@ -312,7 +312,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 @@ VARIABLE_NAME INNODB_FATAL_SEMAPHORE_WAIT_THRESHOLD
@@ -540,7 +540,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 @@ VARIABLE_NAME INNODB_FLUSHING_AVG_LOOPS
@@ -588,7 +588,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 @@ VARIABLE_NAME INNODB_FLUSH_LOG_AT_TRX_COMMIT
@@ -612,7 +612,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 @@ VARIABLE_NAME INNODB_FLUSH_NEIGHBORS
@@ -636,7 +636,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 @@ VARIABLE_NAME INNODB_FORCE_RECOVERY
@@ -672,7 +672,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 @@ VARIABLE_NAME INNODB_FT_CACHE_SIZE
@@ -696,10 +696,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 @@ VARIABLE_NAME INNODB_FT_MAX_TOKEN_SIZE
@@ -732,7 +732,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 @@ VARIABLE_NAME INNODB_FT_MIN_TOKEN_SIZE
@@ -744,7 +744,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 @@ VARIABLE_NAME INNODB_FT_NUM_WORD_OPTIMIZE
@@ -756,7 +756,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 @@ VARIABLE_NAME INNODB_FT_RESULT_CACHE_LIMIT
@@ -768,10 +768,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 @@ VARIABLE_NAME INNODB_FT_SORT_PLL_DEGREE
@@ -792,7 +792,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 @@ VARIABLE_NAME INNODB_FT_TOTAL_CACHE_SIZE
@@ -804,10 +804,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 @@ VARIABLE_NAME INNODB_IO_CAPACITY
@@ -852,22 +852,22 @@ VARIABLE_NAME INNODB_IO_CAPACITY
SESSION_VALUE NULL
DEFAULT_VALUE 200
VARIABLE_SCOPE GLOBAL
@ -215,20 +215,20 @@
NUMERIC_BLOCK_SIZE 0
ENUM_VALUE_LIST NULL
READ_ONLY NO
@@ -959,10 +959,10 @@
@@ -984,10 +984,10 @@ VARIABLE_NAME INNODB_LRU_FLUSH_SIZE
SESSION_VALUE NULL
DEFAULT_VALUE 32
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 18446744073709551615
+NUMERIC_MAX_VALUE 4294967295
NUMERIC_BLOCK_SIZE 0
ENUM_VALUE_LIST NULL
READ_ONLY NO
@@ -971,10 +971,10 @@
@@ -996,10 +996,10 @@ VARIABLE_NAME INNODB_LRU_SCAN_DEPTH
SESSION_VALUE NULL
DEFAULT_VALUE 1536
VARIABLE_SCOPE GLOBAL
@ -241,7 +241,7 @@
NUMERIC_BLOCK_SIZE 0
ENUM_VALUE_LIST NULL
READ_ONLY NO
@@ -1007,10 +1007,10 @@
@@ -1032,10 +1032,10 @@ VARIABLE_NAME INNODB_MAX_PURGE_LAG
SESSION_VALUE NULL
DEFAULT_VALUE 0
VARIABLE_SCOPE GLOBAL
@ -254,7 +254,7 @@
NUMERIC_BLOCK_SIZE 0
ENUM_VALUE_LIST NULL
READ_ONLY NO
@@ -1019,7 +1019,7 @@
@@ -1044,7 +1044,7 @@ VARIABLE_NAME INNODB_MAX_PURGE_LAG_DELAY
SESSION_VALUE NULL
DEFAULT_VALUE 0
VARIABLE_SCOPE GLOBAL
@ -263,7 +263,7 @@
VARIABLE_COMMENT Maximum delay of user threads in micro-seconds
NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 10000000
@@ -1151,10 +1151,10 @@
@@ -1176,10 +1176,10 @@ VARIABLE_NAME INNODB_OPEN_FILES
SESSION_VALUE NULL
DEFAULT_VALUE 0
VARIABLE_SCOPE GLOBAL
@ -276,7 +276,7 @@
NUMERIC_BLOCK_SIZE 0
ENUM_VALUE_LIST NULL
READ_ONLY YES
@@ -1175,7 +1175,7 @@
@@ -1200,7 +1200,7 @@ VARIABLE_NAME INNODB_PAGE_SIZE
SESSION_VALUE NULL
DEFAULT_VALUE 16384
VARIABLE_SCOPE GLOBAL
@ -285,16 +285,16 @@
VARIABLE_COMMENT Page size to use for all InnoDB tablespaces
NUMERIC_MIN_VALUE 4096
NUMERIC_MAX_VALUE 65536
@@ -1211,7 +1211,7 @@
@@ -1236,7 +1236,7 @@ VARIABLE_NAME INNODB_PURGE_BATCH_SIZE
SESSION_VALUE NULL
DEFAULT_VALUE 1000
DEFAULT_VALUE 127
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT UNSIGNED
+VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT Number of UNDO log pages to purge in one batch from the history list
NUMERIC_MIN_VALUE 1
NUMERIC_MAX_VALUE 5000
@@ -1223,7 +1223,7 @@
@@ -1248,7 +1248,7 @@ VARIABLE_NAME INNODB_PURGE_RSEG_TRUNCATE_FREQUENCY
SESSION_VALUE NULL
DEFAULT_VALUE 128
VARIABLE_SCOPE GLOBAL
@ -303,7 +303,7 @@
VARIABLE_COMMENT Unused
NUMERIC_MIN_VALUE 1
NUMERIC_MAX_VALUE 128
@@ -1259,7 +1259,7 @@
@@ -1284,7 +1284,7 @@ VARIABLE_NAME INNODB_READ_AHEAD_THRESHOLD
SESSION_VALUE NULL
DEFAULT_VALUE 56
VARIABLE_SCOPE GLOBAL
@ -312,7 +312,7 @@
VARIABLE_COMMENT Number of pages that must be accessed sequentially for InnoDB to trigger a readahead
NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 64
@@ -1343,7 +1343,7 @@
@@ -1368,7 +1368,7 @@ VARIABLE_NAME INNODB_SORT_BUFFER_SIZE
SESSION_VALUE NULL
DEFAULT_VALUE 1048576
VARIABLE_SCOPE GLOBAL
@ -321,7 +321,7 @@
VARIABLE_COMMENT Memory buffer size for index creation
NUMERIC_MIN_VALUE 65536
NUMERIC_MAX_VALUE 67108864
@@ -1511,10 +1511,10 @@
@@ -1536,10 +1536,10 @@ VARIABLE_NAME INNODB_SYNC_SPIN_LOOPS
SESSION_VALUE NULL
DEFAULT_VALUE 30
VARIABLE_SCOPE GLOBAL

View file

@ -1,6 +1,6 @@
--- a/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result
+++ b/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result
@@ -4649,99 +4649,9 @@
@@ -4709,99 +4709,9 @@ VARIABLE_COMMENT Define threads usage for handling queries
NUMERIC_MIN_VALUE NULL
NUMERIC_MAX_VALUE NULL
NUMERIC_BLOCK_SIZE NULL
@ -31,7 +31,7 @@
-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
@ -61,7 +61,7 @@
-VARIABLE_NAME THREAD_POOL_PRIORITY
-VARIABLE_SCOPE SESSION
-VARIABLE_TYPE ENUM
-VARIABLE_COMMENT Threadpool priority. High priority connections usually start executing earlier than low priority.If priority set to 'auto', the the actual priority(low or high) is determined based on whether or not connection is inside transaction
-VARIABLE_COMMENT Threadpool priority. High priority connections usually start executing earlier than low priority. If priority set to 'auto', the the actual priority(low or high) is determined based on whether or not connection is inside transaction
-NUMERIC_MIN_VALUE NULL
-NUMERIC_MAX_VALUE NULL
-NUMERIC_BLOCK_SIZE NULL
@ -91,7 +91,7 @@
-VARIABLE_NAME THREAD_POOL_STALL_LIMIT
-VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE INT UNSIGNED
-VARIABLE_COMMENT Maximum query execution time in milliseconds,before an executing non-yielding thread is considered stalled.If a worker thread is stalled, additional worker thread may be created to handle remaining clients
-VARIABLE_COMMENT Maximum query execution time in milliseconds, before an executing non-yielding thread is considered stalled. If a worker thread is stalled, additional worker thread may be created to handle remaining clients
-NUMERIC_MIN_VALUE 1
-NUMERIC_MAX_VALUE 4294967295
-NUMERIC_BLOCK_SIZE 1