Skip to content

Commit edf87d3

Browse files
committed
fix: The issue that MySQL 9.3 fails to start due to the removal of system variables is fixed
1 parent e730674 commit edf87d3

File tree

5 files changed

+7
-5
lines changed

5 files changed

+7
-5
lines changed

modules/mysql/src/main/resources/mysql-default-conf/my.cnf

-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ innodb_data_file_path = ibdata1:10M:autoextend
4343
innodb_buffer_pool_size = 16M
4444
#innodb_additional_mem_pool_size = 2M
4545
# Set .._log_file_size to 25 % of buffer pool size
46-
innodb_log_file_size = 5M
4746
innodb_log_buffer_size = 8M
4847
innodb_flush_log_at_trx_commit = 1
4948
innodb_lock_wait_timeout = 50

modules/mysql/src/test/java/org/testcontainers/MySQLTestImages.java

+2
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,6 @@ public class MySQLTestImages {
99
public static final DockerImageName MYSQL_80_IMAGE = DockerImageName.parse("mysql:8.0.36");
1010

1111
public static final DockerImageName MYSQL_INNOVATION_IMAGE = DockerImageName.parse("mysql:8.3.0");
12+
13+
public static final DockerImageName MYSQL_93_IMAGE = DockerImageName.parse("mysql:9.3.0");
1214
}

modules/mysql/src/test/java/org/testcontainers/containers/MySQLRootAccountTest.java

+4-3
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,10 @@ public class MySQLRootAccountTest {
1919
@Parameterized.Parameters(name = "{0}")
2020
public static DockerImageName[] params() {
2121
return new DockerImageName[] {
22-
MySQLTestImages.MYSQL_57_IMAGE,
23-
MySQLTestImages.MYSQL_80_IMAGE,
24-
MySQLTestImages.MYSQL_INNOVATION_IMAGE,
22+
// MySQLTestImages.MYSQL_57_IMAGE,
23+
// MySQLTestImages.MYSQL_80_IMAGE,
24+
// MySQLTestImages.MYSQL_INNOVATION_IMAGE,
25+
MySQLTestImages.MYSQL_93_IMAGE
2526
};
2627
}
2728

modules/mysql/src/test/java/org/testcontainers/junit/mysql/MultiVersionMySQLTest.java

+1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ public static DockerImageName[] params() {
2222
MySQLTestImages.MYSQL_57_IMAGE,
2323
MySQLTestImages.MYSQL_80_IMAGE,
2424
MySQLTestImages.MYSQL_INNOVATION_IMAGE,
25+
MySQLTestImages.MYSQL_93_IMAGE
2526
};
2627
}
2728

modules/mysql/src/test/resources/somepath/mysql_conf_override/my.cnf

-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ innodb_data_file_path = ibdata1:10M:autoextend
4646
innodb_buffer_pool_size = 16M
4747
#innodb_additional_mem_pool_size = 2M
4848
# Set .._log_file_size to 25 % of buffer pool size
49-
innodb_log_file_size = 5M
5049
innodb_log_buffer_size = 8M
5150
innodb_flush_log_at_trx_commit = 1
5251
innodb_lock_wait_timeout = 50

0 commit comments

Comments
 (0)