Skip to content

Commit af345b7

Browse files
committed
MDEV-27891: Make the test work with debug builds
1 parent ed20e5b commit af345b7

File tree

3 files changed

+15
-13
lines changed

3 files changed

+15
-13
lines changed
Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
1-
2-
MDEV-27891: Delayed SIGSEGV in InnoDB buffer pool resize
3-
after or during DROP TABLE
4-
1+
SET @save_size=@@innodb_buffer_pool_size;
2+
#
3+
# MDEV-27891: Delayed SIGSEGV in InnoDB buffer pool resize
4+
# after or during DROP TABLE
5+
#
56
select @@innodb_buffer_pool_chunk_size;
67
@@innodb_buffer_pool_chunk_size
78
1048576
89
CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=InnoDB;
910
SET GLOBAL innodb_buffer_pool_size=256*1024*1024;
1011
DROP TABLE t1;
1112
SET GLOBAL innodb_buffer_pool_size=@@innodb_buffer_pool_size + @@innodb_buffer_pool_chunk_size;
12-
# end of 10.6 test
13-
set global innodb_buffer_pool_size = 8388608;;
13+
# End of 10.6 tests
14+
SET GLOBAL innodb_buffer_pool_size=@save_size;
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
--innodb-buffer-pool-chunk-size=1M
2+
--loose-skip-innodb-disable-resize_buffer_pool_debug
Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
--source include/have_innodb.inc
22
--source include/big_test.inc
33

4-
--let $save_size= `SELECT @@GLOBAL.innodb_buffer_pool_size`
4+
SET @save_size=@@innodb_buffer_pool_size;
55

66
let $wait_timeout = 60;
77
let $wait_condition =
88
SELECT SUBSTR(variable_value, 1, 30) = 'Completed resizing buffer pool'
99
FROM information_schema.global_status
1010
WHERE variable_name = 'INNODB_BUFFER_POOL_RESIZE_STATUS';
1111

12-
--echo
13-
--echo MDEV-27891: Delayed SIGSEGV in InnoDB buffer pool resize
14-
--echo after or during DROP TABLE
15-
--echo
12+
--echo #
13+
--echo # MDEV-27891: Delayed SIGSEGV in InnoDB buffer pool resize
14+
--echo # after or during DROP TABLE
15+
--echo #
1616

1717
select @@innodb_buffer_pool_chunk_size;
1818
CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=InnoDB;
@@ -22,7 +22,7 @@ DROP TABLE t1;
2222
SET GLOBAL innodb_buffer_pool_size=@@innodb_buffer_pool_size + @@innodb_buffer_pool_chunk_size;
2323
--source include/wait_condition.inc
2424

25-
--echo # end of 10.6 test
25+
--echo # End of 10.6 tests
2626

27-
--eval set global innodb_buffer_pool_size = $save_size;
27+
SET GLOBAL innodb_buffer_pool_size=@save_size;
2828
--source include/wait_condition.inc

0 commit comments

Comments
 (0)