summaryrefslogtreecommitdiff
path: root/mysql-test/suite
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2017-06-19 15:59:19 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2017-06-19 15:59:19 +0300
commit5e4f4ec8211b61e71ec29069161d0f41f4c05376 (patch)
tree99eb147bed128ef1fe87bcc9a79cd27733e19a72 /mysql-test/suite
parent3a37afec293e36e51b83a9bd338ad5f74e7f63c0 (diff)
downloadmariadb-git-5e4f4ec8211b61e71ec29069161d0f41f4c05376.tar.gz
MDEV-12975 InnoDB redo log minimum size check uses detected file size instead of requested innodb_log_file_size
log_calc_max_ages(): Use the requested size in the check, instead of the detected redo log size. The redo log will be resized at startup if it differs from what has been requested.
Diffstat (limited to 'mysql-test/suite')
-rw-r--r--mysql-test/suite/innodb/t/log_file_size.test8
1 files changed, 7 insertions, 1 deletions
diff --git a/mysql-test/suite/innodb/t/log_file_size.test b/mysql-test/suite/innodb/t/log_file_size.test
index 4bae93957e8..6c1003881cf 100644
--- a/mysql-test/suite/innodb/t/log_file_size.test
+++ b/mysql-test/suite/innodb/t/log_file_size.test
@@ -1,6 +1,6 @@
# Test resizing the InnoDB redo log.
---source include/have_innodb.inc
+--source include/innodb_page_size.inc
# Embedded server does not support crashing
--source include/not_embedded.inc
@@ -37,6 +37,12 @@ call mtr.add_suppression("Attempting backtrace");
FLUSH TABLES;
--enable_query_log
+--let $restart_parameters= --innodb-thread-concurrency=1 --innodb-log-file-size=1m --innodb-log-files-in-group=2
+--source include/restart_mysqld.inc
+
+--let $restart_parameters= --innodb-thread-concurrency=100 --innodb-log-file-size=10M --innodb-log-files-in-group=2
+--source include/restart_mysqld.inc
+
CREATE TABLE t1(a INT PRIMARY KEY) ENGINE=InnoDB;
BEGIN;
INSERT INTO t1 VALUES (42);