Skip to content

Commit c009ce7

Browse files
committed
MDEV-27094 Debug builds include useless InnoDB "disabled" options
This is a backport of commit 4489a89 in order to remove the test innodb.redo_log_during_checkpoint that would cause trouble in the DBUG subsystem invoked by safe_mutex_lock() via log_checkpoint(). Before commit 7cffb5f these mutexes were of different type. The following options were introduced in commit 2e814d4 (mariadb-10.2.2) and have little use: innodb_disable_resize_buffer_pool_debug had no effect even in MariaDB 10.2.2 or MySQL 5.7.9. It was introduced in mysql/mysql-server@5c4094c to work around a problem that was fixed in mysql/mysql-server@2957ae4 (but the parameter was not removed). innodb_page_cleaner_disabled_debug and innodb_master_thread_disabled_debug are only used by the test innodb.redo_log_during_checkpoint that will be removed as part of this commit. innodb_dict_stats_disabled_debug is only used by that test, and it is redundant because one could simply use innodb_stats_persistent=OFF or the STATS_PERSISTENT=0 attribute of the table in the test to achieve the same effect.
1 parent 620c55e commit c009ce7

25 files changed

+4
-829
lines changed

mysql-test/suite/innodb/r/buf_pool_resize_oom.result

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
# ONLINE WITH MEMORY FULL CONDITION
44
#
55
call mtr.add_suppression("InnoDB: failed to allocate the chunk array");
6-
SET GLOBAL innodb_disable_resize_buffer_pool_debug=OFF;
76
SET GLOBAL debug_dbug='+d,buf_pool_resize_chunk_null';
87
SET GLOBAL innodb_buffer_pool_size=@@innodb_buffer_pool_size + 1048576;
98
# restart

mysql-test/suite/innodb/r/innodb_buffer_pool_resize_debug.result

Lines changed: 0 additions & 106 deletions
This file was deleted.
Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
SET @save_limit=@@GLOBAL.innodb_limit_optimistic_insert_debug;
2-
SET @save_disable=@@GLOBAL.innodb_disable_resize_buffer_pool_debug;
32
SET @save_size=@@GLOBAL.innodb_buffer_pool_size;
43
SET GLOBAL innodb_limit_optimistic_insert_debug=2;
5-
SET GLOBAL innodb_disable_resize_buffer_pool_debug=OFF;
64
SET GLOBAL innodb_buffer_pool_size=16777216;
75
CREATE TEMPORARY TABLE t1 (a INT PRIMARY KEY) ENGINE=InnoDB;
86
INSERT INTO t1 SELECT seq FROM seq_1_to_200;
@@ -13,4 +11,3 @@ COUNT(*) MIN(a) MAX(a)
1311
DROP TEMPORARY TABLE t1;
1412
SET GLOBAL innodb_limit_optimistic_insert_debug=@save_limit;
1513
SET GLOBAL innodb_buffer_pool_size=@save_size;
16-
SET GLOBAL innodb_disable_resize_buffer_pool_debug=@save_disable;

mysql-test/suite/innodb/r/redo_log_during_checkpoint.result

Lines changed: 0 additions & 20 deletions
This file was deleted.

mysql-test/suite/innodb/t/buf_pool_resize_oom.test

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99

1010
call mtr.add_suppression("InnoDB: failed to allocate the chunk array");
1111

12-
SET GLOBAL innodb_disable_resize_buffer_pool_debug=OFF;
1312
SET GLOBAL debug_dbug='+d,buf_pool_resize_chunk_null';
1413

1514
--disable_warnings

mysql-test/suite/innodb/t/innodb_buffer_pool_resize.test

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,6 @@ let $wait_condition =
1414
--disable_query_log
1515
set @old_innodb_buffer_pool_size = @@innodb_buffer_pool_size;
1616
set @old_innodb_adaptive_hash_index = @@innodb_adaptive_hash_index;
17-
if (`select (version() like '%debug%') > 0`)
18-
{
19-
set @old_innodb_disable_resize = @@innodb_disable_resize_buffer_pool_debug;
20-
set global innodb_disable_resize_buffer_pool_debug = OFF;
21-
}
2217
--enable_query_log
2318

2419
set global innodb_adaptive_hash_index=ON;
@@ -66,9 +61,5 @@ drop view view0;
6661
--disable_query_log
6762
set global innodb_adaptive_hash_index = @old_innodb_adaptive_hash_index;
6863
set global innodb_buffer_pool_size = @old_innodb_buffer_pool_size;
69-
if (`select (version() like '%debug%') > 0`)
70-
{
71-
set global innodb_disable_resize_buffer_pool_debug = @old_innodb_disable_resize;
72-
}
7364
--enable_query_log
7465
--source include/wait_condition.inc

0 commit comments

Comments
 (0)