From 94ece8ef83af60c70020fd73936ea4a66ebbda66 Mon Sep 17 00:00:00 2001 From: Monty Date: Thu, 18 Dec 2025 17:13:27 +0200 Subject: [PATCH] Fixed mtr test that fails with valgrind build and max_session_mem_used perfschema.misc_session_status and main.max_session_mem_used fixed by including not_valgrind_build.inc --- mysql-test/main/max_session_mem_used.test | 3 ++- mysql-test/suite/innodb/r/innodb_buffer_pool_resize.result | 4 ++-- .../innodb/r/innodb_buffer_pool_resize_temporary.result | 2 +- mysql-test/suite/perfschema/t/misc_session_status.test | 3 ++- mysql-test/suite/sys_vars/r/sysvars_innodb.result | 6 +++--- 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/mysql-test/main/max_session_mem_used.test b/mysql-test/main/max_session_mem_used.test index ba270470c3b..9c4a0b569ca 100644 --- a/mysql-test/main/max_session_mem_used.test +++ b/mysql-test/main/max_session_mem_used.test @@ -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; diff --git a/mysql-test/suite/innodb/r/innodb_buffer_pool_resize.result b/mysql-test/suite/innodb/r/innodb_buffer_pool_resize.result index 7b254daf492..46f5549c3e0 100644 --- a/mysql-test/suite/innodb/r/innodb_buffer_pool_resize.result +++ b/mysql-test/suite/innodb/r/innodb_buffer_pool_resize.result @@ -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; diff --git a/mysql-test/suite/innodb/r/innodb_buffer_pool_resize_temporary.result b/mysql-test/suite/innodb/r/innodb_buffer_pool_resize_temporary.result index 12fb02a40c7..7af3268b970 100644 --- a/mysql-test/suite/innodb/r/innodb_buffer_pool_resize_temporary.result +++ b/mysql-test/suite/innodb/r/innodb_buffer_pool_resize_temporary.result @@ -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; diff --git a/mysql-test/suite/perfschema/t/misc_session_status.test b/mysql-test/suite/perfschema/t/misc_session_status.test index f32896d6077..b64d161a12b 100644 --- a/mysql-test/suite/perfschema/t/misc_session_status.test +++ b/mysql-test/suite/perfschema/t/misc_session_status.test @@ -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 # diff --git a/mysql-test/suite/sys_vars/r/sysvars_innodb.result b/mysql-test/suite/sys_vars/r/sysvars_innodb.result index b9f1e8b68f6..06ac058eb57 100644 --- a/mysql-test/suite/sys_vars/r/sysvars_innodb.result +++ b/mysql-test/suite/sys_vars/r/sysvars_innodb.result @@ -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