MDEV-27891: Make the test work with debug builds

MariaDB · Mar 8, 2022 · af345b7 · af345b7
1 parent ed20e5b
commit af345b7
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 13 deletions.
diff --git a/mysql-test/suite/innodb/r/innodb_buffer_pool_resize_bigtest.result b/mysql-test/suite/innodb/r/innodb_buffer_pool_resize_bigtest.result
@@ -1,13 +1,14 @@
-
-MDEV-27891: Delayed SIGSEGV in InnoDB buffer pool resize
-after or during DROP TABLE
-
+SET @save_size=@@innodb_buffer_pool_size;
+#
+# MDEV-27891: Delayed SIGSEGV in InnoDB buffer pool resize
+# after or during DROP TABLE
+#
 select @@innodb_buffer_pool_chunk_size;
 @@innodb_buffer_pool_chunk_size
 1048576
 CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=InnoDB;
 SET GLOBAL innodb_buffer_pool_size=256*1024*1024;
 DROP TABLE t1;
 SET GLOBAL innodb_buffer_pool_size=@@innodb_buffer_pool_size + @@innodb_buffer_pool_chunk_size;
-# end of 10.6 test
-set global innodb_buffer_pool_size = 8388608;;
+# End of 10.6 tests
+SET GLOBAL innodb_buffer_pool_size=@save_size;
diff --git a/mysql-test/suite/innodb/t/innodb_buffer_pool_resize_bigtest.opt b/mysql-test/suite/innodb/t/innodb_buffer_pool_resize_bigtest.opt
@@ -1 +1,2 @@
 --innodb-buffer-pool-chunk-size=1M
+--loose-skip-innodb-disable-resize_buffer_pool_debug
diff --git a/mysql-test/suite/innodb/t/innodb_buffer_pool_resize_bigtest.test b/mysql-test/suite/innodb/t/innodb_buffer_pool_resize_bigtest.test
@@ -1,18 +1,18 @@
 --source include/have_innodb.inc
 --source include/big_test.inc
 
---let $save_size= `SELECT @@GLOBAL.innodb_buffer_pool_size`
+SET @save_size=@@innodb_buffer_pool_size;
 
 let $wait_timeout = 60;
 let $wait_condition =
   SELECT SUBSTR(variable_value, 1, 30) = 'Completed resizing buffer pool'
   FROM information_schema.global_status
   WHERE variable_name = 'INNODB_BUFFER_POOL_RESIZE_STATUS';
 
---echo
---echo MDEV-27891: Delayed SIGSEGV in InnoDB buffer pool resize
---echo after or during DROP TABLE
---echo
+--echo #
+--echo # MDEV-27891: Delayed SIGSEGV in InnoDB buffer pool resize
+--echo # after or during DROP TABLE
+--echo #
 
 select @@innodb_buffer_pool_chunk_size;
 CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=InnoDB;
@@ -22,7 +22,7 @@ DROP TABLE t1;
 SET GLOBAL innodb_buffer_pool_size=@@innodb_buffer_pool_size + @@innodb_buffer_pool_chunk_size;
 --source include/wait_condition.inc
 
---echo # end of 10.6 test
+--echo # End of 10.6 tests
 
---eval set global innodb_buffer_pool_size = $save_size;
+SET GLOBAL innodb_buffer_pool_size=@save_size;
 --source include/wait_condition.inc