diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-03-08 09:04:24 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-03-08 09:04:24 +0200 |
| commit | af345b72a95dbd92c28034d4a0d33c3e27eca437 (patch) | |
| tree | 93b2986be5094997733e5407988c62a5977ad518 | |
| parent | ed20e5b111c32e0913d789f8c8b9fc2d8b2b40a2 (diff) | |
| download | mariadb-git-af345b72a95dbd92c28034d4a0d33c3e27eca437.tar.gz | |
MDEV-27891: Make the test work with debug builds
3 files changed, 15 insertions, 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 index 6035105547f..d6b29060dc7 100644 --- 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,7 +1,8 @@ - -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 @@ -9,5 +10,5 @@ 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 index fbc8b098c0d..72f055d3b58 100644 --- 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 index a4a4b6bb447..db5da2924fa 100644 --- 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,7 +1,7 @@ --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 = @@ -9,10 +9,10 @@ let $wait_condition = 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 |