Skip to content

Commit 0eabc28

Browse files
dr-mdr-m
committed
Merge 10.3 into 10.4 (MDEV-27913)
2 parents 4676465 + 7ab3db1 commit 0eabc28

11 files changed

+142
-68
lines changed

‎mysql-test/suite/innodb_fts/r/bug_32831765.result

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
call mtr.add_suppression("InnoDB: Total InnoDB FTS size .* for the table .* exceeds the innodb_ft_cache_size .*");
12
#
23
# Bug#32831765 SERVER HITS OOM CONDITION WHEN LOADING TWO
34
# INNODB TABLES WITH FTS INDEXES

‎mysql-test/suite/innodb_fts/t/bug_32831765.test

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
--source include/have_debug.inc
33
--source include/big_test.inc
44

5+
call mtr.add_suppression("InnoDB: Total InnoDB FTS size .* for the table .* exceeds the innodb_ft_cache_size .*");
56
--echo #
67
--echo # Bug#32831765 SERVER HITS OOM CONDITION WHEN LOADING TWO
78
--echo # INNODB TABLES WITH FTS INDEXES

‎mysql-test/suite/sys_vars/r/innodb_ft_cache_size_basic.result

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,15 @@ select * from information_schema.session_variables where variable_name='innodb_f
1616
VARIABLE_NAME VARIABLE_VALUE
1717
INNODB_FT_CACHE_SIZE 8000000
1818
set global innodb_ft_cache_size=1;
19-
ERROR HY000: Variable 'innodb_ft_cache_size' is a read only variable
19+
Warnings:
20+
Warning 1292 Truncated incorrect innodb_ft_cache_size value: '1'
21+
SHOW VARIABLES like 'innodb_ft_cache_size';
22+
Variable_name Value
23+
innodb_ft_cache_size 1600000
2024
set session innodb_ft_cache_size=1;
21-
ERROR HY000: Variable 'innodb_ft_cache_size' is a read only variable
25+
ERROR HY000: Variable 'innodb_ft_cache_size' is a GLOBAL variable and should be set with SET GLOBAL
26+
set global innodb_ft_cache_size=512*1024*1024;
27+
SHOW VARIABLES like 'innodb_ft_cache_size';
28+
Variable_name Value
29+
innodb_ft_cache_size 536870912
30+
set global innodb_ft_cache_size=default;

‎mysql-test/suite/sys_vars/r/innodb_ft_total_cache_size_basic.result

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,15 @@ select * from information_schema.session_variables where variable_name='innodb_f
1616
VARIABLE_NAME VARIABLE_VALUE
1717
INNODB_FT_TOTAL_CACHE_SIZE 640000000
1818
set global innodb_ft_total_cache_size=1;
19-
ERROR HY000: Variable 'innodb_ft_total_cache_size' is a read only variable
19+
Warnings:
20+
Warning 1292 Truncated incorrect innodb_ft_total_cache_size value: '1'
2021
set session innodb_ft_total_cache_size=1;
21-
ERROR HY000: Variable 'innodb_ft_total_cache_size' is a read only variable
22+
ERROR HY000: Variable 'innodb_ft_total_cache_size' is a GLOBAL variable and should be set with SET GLOBAL
23+
SHOW VARIABLES like 'innodb_ft_total_cache_size';
24+
Variable_name Value
25+
innodb_ft_total_cache_size 32000000
26+
set global innodb_ft_total_cache_size=512*1024*1024;
27+
show variables like 'innodb_ft_total_cache_size';
28+
Variable_name Value
29+
innodb_ft_total_cache_size 536870912
30+
set global innodb_ft_total_cache_size=default;

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

Lines changed: 45 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@
114114
NUMERIC_BLOCK_SIZE 0
115115
ENUM_VALUE_LIST NULL
116116
READ_ONLY NO
117-
@@ -697,7 +697,7 @@
117+
@@ -709,7 +709,7 @@
118118
SESSION_VALUE NULL
119119
DEFAULT_VALUE 120
120120
VARIABLE_SCOPE GLOBAL
@@ -123,7 +123,7 @@
123123
VARIABLE_COMMENT Number of pages reserved in doublewrite buffer for batch flushing
124124
NUMERIC_MIN_VALUE 1
125125
NUMERIC_MAX_VALUE 127
126-
@@ -793,7 +793,7 @@
126+
@@ -805,7 +805,7 @@
127127
SESSION_VALUE NULL
128128
DEFAULT_VALUE 600
129129
VARIABLE_SCOPE GLOBAL
@@ -132,7 +132,7 @@
132132
VARIABLE_COMMENT Maximum number of seconds that semaphore times out in InnoDB.
133133
NUMERIC_MIN_VALUE 1
134134
NUMERIC_MAX_VALUE 4294967295
135-
@@ -841,7 +841,7 @@
135+
@@ -853,7 +853,7 @@
136136
SESSION_VALUE NULL
137137
DEFAULT_VALUE 0
138138
VARIABLE_SCOPE GLOBAL
@@ -141,7 +141,7 @@
141141
VARIABLE_COMMENT Make the first page of the given tablespace dirty.
142142
NUMERIC_MIN_VALUE 0
143143
NUMERIC_MAX_VALUE 4294967295
144-
@@ -853,7 +853,7 @@
144+
@@ -865,7 +865,7 @@
145145
SESSION_VALUE NULL
146146
DEFAULT_VALUE 30
147147
VARIABLE_SCOPE GLOBAL
@@ -150,7 +150,7 @@
150150
VARIABLE_COMMENT Number of iterations over which the background flushing is averaged.
151151
NUMERIC_MIN_VALUE 1
152152
NUMERIC_MAX_VALUE 1000
153-
@@ -877,7 +877,7 @@
153+
@@ -889,7 +889,7 @@
154154
SESSION_VALUE NULL
155155
DEFAULT_VALUE 1
156156
VARIABLE_SCOPE GLOBAL
@@ -159,7 +159,7 @@
159159
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.
160160
NUMERIC_MIN_VALUE 0
161161
NUMERIC_MAX_VALUE 3
162-
@@ -901,7 +901,7 @@
162+
@@ -913,7 +913,7 @@
163163
SESSION_VALUE NULL
164164
DEFAULT_VALUE 1
165165
VARIABLE_SCOPE GLOBAL
@@ -168,7 +168,7 @@
168168
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
169169
NUMERIC_MIN_VALUE 0
170170
NUMERIC_MAX_VALUE 2
171-
@@ -949,7 +949,7 @@
171+
@@ -961,7 +961,7 @@
172172
SESSION_VALUE NULL
173173
DEFAULT_VALUE 0
174174
VARIABLE_SCOPE GLOBAL
@@ -177,16 +177,20 @@
177177
VARIABLE_COMMENT Helps to save your data in case the disk image of the database becomes corrupt.
178178
NUMERIC_MIN_VALUE 0
179179
NUMERIC_MAX_VALUE 6
180-
@@ -973,7 +973,7 @@
180+
@@ -985,10 +985,10 @@
181181
SESSION_VALUE NULL
182182
DEFAULT_VALUE 8000000
183183
VARIABLE_SCOPE GLOBAL
184184
-VARIABLE_TYPE BIGINT UNSIGNED
185185
+VARIABLE_TYPE INT UNSIGNED
186186
VARIABLE_COMMENT InnoDB Fulltext search cache size in bytes
187187
NUMERIC_MIN_VALUE 1600000
188-
NUMERIC_MAX_VALUE 80000000
189-
@@ -1009,7 +1009,7 @@
188+
-NUMERIC_MAX_VALUE 1099511627776
189+
+NUMERIC_MAX_VALUE 536870912
190+
NUMERIC_BLOCK_SIZE 0
191+
ENUM_VALUE_LIST NULL
192+
READ_ONLY NO
193+
@@ -1021,7 +1021,7 @@
190194
SESSION_VALUE NULL
191195
DEFAULT_VALUE 84
192196
VARIABLE_SCOPE GLOBAL
@@ -195,7 +199,7 @@
195199
VARIABLE_COMMENT InnoDB Fulltext search maximum token size in characters
196200
NUMERIC_MIN_VALUE 10
197201
NUMERIC_MAX_VALUE 84
198-
@@ -1021,7 +1021,7 @@
202+
@@ -1033,7 +1033,7 @@
199203
SESSION_VALUE NULL
200204
DEFAULT_VALUE 3
201205
VARIABLE_SCOPE GLOBAL
@@ -204,7 +208,7 @@
204208
VARIABLE_COMMENT InnoDB Fulltext search minimum token size in characters
205209
NUMERIC_MIN_VALUE 0
206210
NUMERIC_MAX_VALUE 16
207-
@@ -1033,7 +1033,7 @@
211+
@@ -1045,7 +1045,7 @@
208212
SESSION_VALUE NULL
209213
DEFAULT_VALUE 2000
210214
VARIABLE_SCOPE GLOBAL
@@ -213,7 +217,7 @@
213217
VARIABLE_COMMENT InnoDB Fulltext search number of words to optimize for each optimize table call
214218
NUMERIC_MIN_VALUE 1000
215219
NUMERIC_MAX_VALUE 10000
216-
@@ -1045,10 +1045,10 @@
220+
@@ -1057,10 +1057,10 @@
217221
SESSION_VALUE NULL
218222
DEFAULT_VALUE 2000000000
219223
VARIABLE_SCOPE GLOBAL
@@ -226,7 +230,7 @@
226230
NUMERIC_BLOCK_SIZE 0
227231
ENUM_VALUE_LIST NULL
228232
READ_ONLY NO
229-
@@ -1069,7 +1069,7 @@
233+
@@ -1081,7 +1081,7 @@
230234
SESSION_VALUE NULL
231235
DEFAULT_VALUE 2
232236
VARIABLE_SCOPE GLOBAL
@@ -235,16 +239,20 @@
235239
VARIABLE_COMMENT InnoDB Fulltext search parallel sort degree, will round up to nearest power of 2 number
236240
NUMERIC_MIN_VALUE 1
237241
NUMERIC_MAX_VALUE 16
238-
@@ -1081,7 +1081,7 @@
242+
@@ -1093,10 +1093,10 @@
239243
SESSION_VALUE NULL
240244
DEFAULT_VALUE 640000000
241245
VARIABLE_SCOPE GLOBAL
242246
-VARIABLE_TYPE BIGINT UNSIGNED
243247
+VARIABLE_TYPE INT UNSIGNED
244248
VARIABLE_COMMENT Total memory allocated for InnoDB Fulltext Search cache
245249
NUMERIC_MIN_VALUE 32000000
246-
NUMERIC_MAX_VALUE 1600000000
247-
@@ -1105,7 +1105,7 @@
250+
-NUMERIC_MAX_VALUE 1099511627776
251+
+NUMERIC_MAX_VALUE 1600000000
252+
NUMERIC_BLOCK_SIZE 0
253+
ENUM_VALUE_LIST NULL
254+
READ_ONLY NO
255+
@@ -1117,7 +1117,7 @@
248256
SESSION_VALUE NULL
249257
DEFAULT_VALUE 100
250258
VARIABLE_SCOPE GLOBAL
@@ -253,7 +261,7 @@
253261
VARIABLE_COMMENT DEPRECATED. This setting has no effect.
254262
NUMERIC_MIN_VALUE 0
255263
NUMERIC_MAX_VALUE 100
256-
@@ -1141,22 +1141,22 @@
264+
@@ -1153,22 +1153,22 @@
257265
SESSION_VALUE NULL
258266
DEFAULT_VALUE 200
259267
VARIABLE_SCOPE GLOBAL
@@ -281,7 +289,7 @@
281289
NUMERIC_BLOCK_SIZE 0
282290
ENUM_VALUE_LIST NULL
283291
READ_ONLY NO
284-
@@ -1213,7 +1213,7 @@
292+
@@ -1225,7 +1225,7 @@
285293
SESSION_VALUE 50
286294
DEFAULT_VALUE 50
287295
VARIABLE_SCOPE SESSION
@@ -290,7 +298,7 @@
290298
VARIABLE_COMMENT Timeout in seconds an InnoDB transaction may wait for a lock before being rolled back. Values above 100000000 disable the timeout.
291299
NUMERIC_MIN_VALUE 0
292300
NUMERIC_MAX_VALUE 1073741824
293-
@@ -1225,10 +1225,10 @@
301+
@@ -1237,10 +1237,10 @@
294302
SESSION_VALUE NULL
295303
DEFAULT_VALUE 16777216
296304
VARIABLE_SCOPE GLOBAL
@@ -303,7 +311,7 @@
303311
NUMERIC_BLOCK_SIZE 1024
304312
ENUM_VALUE_LIST NULL
305313
READ_ONLY YES
306-
@@ -1273,7 +1273,7 @@
314+
@@ -1285,7 +1285,7 @@
307315
SESSION_VALUE NULL
308316
DEFAULT_VALUE 2
309317
VARIABLE_SCOPE GLOBAL
@@ -312,7 +320,7 @@
312320
VARIABLE_COMMENT Number of log files in the log group. InnoDB writes to the files in a circular fashion.
313321
NUMERIC_MIN_VALUE 1
314322
NUMERIC_MAX_VALUE 100
315-
@@ -1321,7 +1321,7 @@
323+
@@ -1333,7 +1333,7 @@
316324
SESSION_VALUE NULL
317325
DEFAULT_VALUE 8192
318326
VARIABLE_SCOPE GLOBAL
@@ -321,7 +329,7 @@
321329
VARIABLE_COMMENT Redo log write ahead unit size to avoid read-on-write, it should match the OS cache block IO size
322330
NUMERIC_MIN_VALUE 512
323331
NUMERIC_MAX_VALUE 16384
324-
@@ -1333,10 +1333,10 @@
332+
@@ -1345,10 +1345,10 @@
325333
SESSION_VALUE NULL
326334
DEFAULT_VALUE 1024
327335
VARIABLE_SCOPE GLOBAL
@@ -334,7 +342,7 @@
334342
NUMERIC_BLOCK_SIZE 0
335343
ENUM_VALUE_LIST NULL
336344
READ_ONLY NO
337-
@@ -1381,10 +1381,10 @@
345+
@@ -1393,10 +1393,10 @@
338346
SESSION_VALUE NULL
339347
DEFAULT_VALUE 0
340348
VARIABLE_SCOPE GLOBAL
@@ -347,7 +355,7 @@
347355
NUMERIC_BLOCK_SIZE 0
348356
ENUM_VALUE_LIST NULL
349357
READ_ONLY NO
350-
@@ -1393,7 +1393,7 @@
358+
@@ -1405,7 +1405,7 @@
351359
SESSION_VALUE NULL
352360
DEFAULT_VALUE 0
353361
VARIABLE_SCOPE GLOBAL
@@ -356,7 +364,7 @@
356364
VARIABLE_COMMENT Maximum delay of user threads in micro-seconds
357365
NUMERIC_MIN_VALUE 0
358366
NUMERIC_MAX_VALUE 10000000
359-
@@ -1525,10 +1525,10 @@
367+
@@ -1537,10 +1537,10 @@
360368
SESSION_VALUE NULL
361369
DEFAULT_VALUE 0
362370
VARIABLE_SCOPE GLOBAL
@@ -369,7 +377,7 @@
369377
NUMERIC_BLOCK_SIZE 0
370378
ENUM_VALUE_LIST NULL
371379
READ_ONLY YES
372-
@@ -1549,7 +1549,7 @@
380+
@@ -1561,7 +1561,7 @@
373381
SESSION_VALUE NULL
374382
DEFAULT_VALUE 4
375383
VARIABLE_SCOPE GLOBAL
@@ -378,7 +386,7 @@
378386
VARIABLE_COMMENT Page cleaner threads can be from 1 to 64. Default is 4.
379387
NUMERIC_MIN_VALUE 1
380388
NUMERIC_MAX_VALUE 64
381-
@@ -1573,7 +1573,7 @@
389+
@@ -1585,7 +1585,7 @@
382390
SESSION_VALUE NULL
383391
DEFAULT_VALUE 16
384392
VARIABLE_SCOPE GLOBAL
@@ -387,7 +395,7 @@
387395
VARIABLE_COMMENT Number of rw_locks protecting buffer pool page_hash. Rounded up to the next power of 2
388396
NUMERIC_MIN_VALUE 1
389397
NUMERIC_MAX_VALUE 1024
390-
@@ -1585,7 +1585,7 @@
398+
@@ -1597,7 +1597,7 @@
391399
SESSION_VALUE NULL
392400
DEFAULT_VALUE 16384
393401
VARIABLE_SCOPE GLOBAL
@@ -396,7 +404,7 @@
396404
VARIABLE_COMMENT Page size to use for all InnoDB tablespaces.
397405
NUMERIC_MIN_VALUE 4096
398406
NUMERIC_MAX_VALUE 65536
399-
@@ -1621,7 +1621,7 @@
407+
@@ -1633,7 +1633,7 @@
400408
SESSION_VALUE NULL
401409
DEFAULT_VALUE 300
402410
VARIABLE_SCOPE GLOBAL
@@ -405,7 +413,7 @@
405413
VARIABLE_COMMENT Number of UNDO log pages to purge in one batch from the history list.
406414
NUMERIC_MIN_VALUE 1
407415
NUMERIC_MAX_VALUE 5000
408-
@@ -1633,7 +1633,7 @@
416+
@@ -1645,7 +1645,7 @@
409417
SESSION_VALUE NULL
410418
DEFAULT_VALUE 128
411419
VARIABLE_SCOPE GLOBAL
@@ -414,7 +422,7 @@
414422
VARIABLE_COMMENT Dictates rate at which UNDO records are purged. Value N means purge rollback segment(s) on every Nth iteration of purge invocation
415423
NUMERIC_MIN_VALUE 1
416424
NUMERIC_MAX_VALUE 128
417-
@@ -1645,7 +1645,7 @@
425+
@@ -1657,7 +1657,7 @@
418426
SESSION_VALUE NULL
419427
DEFAULT_VALUE 4
420428
VARIABLE_SCOPE GLOBAL
@@ -423,7 +431,7 @@
423431
VARIABLE_COMMENT Purge threads can be from 1 to 32. Default is 4.
424432
NUMERIC_MIN_VALUE 1
425433
NUMERIC_MAX_VALUE 32
426-
@@ -1669,7 +1669,7 @@
434+
@@ -1681,7 +1681,7 @@
427435
SESSION_VALUE NULL
428436
DEFAULT_VALUE 56
429437
VARIABLE_SCOPE GLOBAL
@@ -432,7 +440,7 @@
432440
VARIABLE_COMMENT Number of pages that must be accessed sequentially for InnoDB to trigger a readahead.
433441
NUMERIC_MIN_VALUE 0
434442
NUMERIC_MAX_VALUE 64
435-
@@ -1681,7 +1681,7 @@
443+
@@ -1693,7 +1693,7 @@
436444
SESSION_VALUE NULL
437445
DEFAULT_VALUE 4
438446
VARIABLE_SCOPE GLOBAL
@@ -441,7 +449,7 @@
441449
VARIABLE_COMMENT Number of background read I/O threads in InnoDB.
442450
NUMERIC_MIN_VALUE 1
443451
NUMERIC_MAX_VALUE 64
444-
@@ -1705,10 +1705,10 @@
452+
@@ -1717,10 +1717,10 @@
445453
SESSION_VALUE NULL
446454
DEFAULT_VALUE 0
447455
VARIABLE_SCOPE GLOBAL
@@ -454,7 +462,7 @@
454462
NUMERIC_BLOCK_SIZE 0
455463
ENUM_VALUE_LIST NULL
456464
READ_ONLY NO
457-
@@ -1729,7 +1729,7 @@
465+
@@ -1741,7 +1741,7 @@
458466
SESSION_VALUE NULL
459467
DEFAULT_VALUE 128
460468
VARIABLE_SCOPE GLOBAL
@@ -463,7 +471,7 @@
463471
VARIABLE_COMMENT Number of undo logs to use (deprecated).
464472
NUMERIC_MIN_VALUE 1
465473
NUMERIC_MAX_VALUE 128
466-
@@ -1741,7 +1741,7 @@
474+
@@ -1753,7 +1753,7 @@
467475
SESSION_VALUE NULL
468476
DEFAULT_VALUE 0
469477
VARIABLE_SCOPE GLOBAL

0 commit comments

Comments
 (0)