Mirrors/MariaDB-server
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-28 08:10:14 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Fixed mtr test that fails with valgrind build and max_session_mem_used
Some checks are pending
Build on Windows ARM64 / build (push) Waiting to run
Details

Browse Source 
perfschema.misc_session_status and main.max_session_mem_used fixed by
including not_valgrind_build.inc
This commit is contained in:
Monty 2025-12-18 17:13:27 +02:00
parent 84fa008d25
commit 94ece8ef83
5 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mysql-test/main/max_session_mem_used.test
View File

@ -1,6 +1,7 @@
# memory usage is sensitive to valgrind/ps-protocol/embedded
source include/not_msan.inc;
source include/not_valgrind.inc;
# We cannot use valgrind build as it uses more memory than normal build
source include/not_valgrind_build.inc;
source include/no_protocol.inc;
source include/not_embedded.inc;
source include/have_64bit.inc;

4
mysql-test/suite/innodb/r/innodb_buffer_pool_resize.result
View File

@ -20,12 +20,12 @@ SET STATEMENT foreign_key_checks=0, unique_checks=0 FOR
INSERT INTO t2 SELECT seq*4,seq*4 FROM seq_1_to_16384;
SELECT @@GLOBAL.innodb_adaptive_hash_index;
@@GLOBAL.innodb_adaptive_hash_index
1
ON
SET STATEMENT max_statement_time=1e-9 FOR
SET GLOBAL innodb_buffer_pool_size = 7340032;
SELECT @@GLOBAL.innodb_adaptive_hash_index;
@@GLOBAL.innodb_adaptive_hash_index
1
ON
FOUND 1 /innodb_buffer_pool_size=7m.*resized from|innodb_buffer_pool_size change aborted/ in mysqld.1.err
set global innodb_buffer_pool_size = 7340032;
select count(val) from t1;

2
mysql-test/suite/innodb/r/innodb_buffer_pool_resize_temporary.result
View File

@ -10,7 +10,7 @@ SET GLOBAL innodb_buffer_pool_size=8388608;
ERROR HY000: innodb_buffer_pool_size change aborted
SELECT @@GLOBAL.innodb_adaptive_hash_index,@@GLOBAL.innodb_buffer_pool_size;
@@GLOBAL.innodb_adaptive_hash_index @@GLOBAL.innodb_buffer_pool_size
1 16777216
ON 16777216
SET GLOBAL innodb_adaptive_hash_index = @old_innodb_adaptive_hash_index;
CREATE TEMPORARY TABLE t1 (a INT PRIMARY KEY) ENGINE=InnoDB;
INSERT INTO t1 SELECT seq FROM seq_1_to_200;

3
mysql-test/suite/perfschema/t/misc_session_status.test
View File

@ -1,7 +1,8 @@
--source include/not_embedded.inc
--source include/have_perfschema.inc
--source include/not_msan.inc
--source include/not_valgrind.inc
# We cannot use valgrind build as it uses more memory than normal build
--source include/not_valgrind_build.inc
# This does not crash on 32 bit because of less memory used
--source include/have_64bit.inc
--echo #

6
mysql-test/suite/sys_vars/r/sysvars_innodb.result
View File

@ -36,12 +36,12 @@ VARIABLE_NAME INNODB_ADAPTIVE_HASH_INDEX
SESSION_VALUE NULL
DEFAULT_VALUE OFF
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE BOOLEAN
VARIABLE_COMMENT Enable InnoDB adaptive hash index (disabled by default)
VARIABLE_TYPE ENUM
VARIABLE_COMMENT Enable InnoDB adaptive hash index. Values OFF (default), ON or IF_SPECIFIED (enabled only tables or indexes that have adaptive_hash_index=on)
NUMERIC_MIN_VALUE NULL
NUMERIC_MAX_VALUE NULL
NUMERIC_BLOCK_SIZE NULL
ENUM_VALUE_LIST OFF,ON
ENUM_VALUE_LIST OFF,ON,IF_SPECIFIED
READ_ONLY NO
COMMAND_LINE_ARGUMENT OPTIONAL
VARIABLE_NAME INNODB_ADAPTIVE_HASH_INDEX_CELLS