This is an automated email from the ASF dual-hosted git repository.
zhangliang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new 4f1a453cbeb Merge my.cnf of MySQL 5.x and 8.x (#36493)
4f1a453cbeb is described below
commit 4f1a453cbeb25a75ce10a511f2726cc10c594009
Author: Liang Zhang <[email protected]>
AuthorDate: Sat Sep 6 19:33:19 2025 +0800
Merge my.cnf of MySQL 5.x and 8.x (#36493)
* Merge my.cnf of MySQL 5.x and 8.x
* Merge my.cnf of MySQL 5.x and 8.x
---
...MariaDBStorageContainerConfigurationOption.java | 2 +-
.../MySQLStorageContainerConfigurationOption.java | 4 +--
.../test/resources/container/mysql/cnf/8/my.cnf | 34 ----------------------
.../resources/container/mysql/cnf/{5 => }/my.cnf | 0
4 files changed, 3 insertions(+), 37 deletions(-)
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/option/dialect/MariaDBStorageContainerConfigurationOption.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/option/dialect/MariaDBStorageContainerConfigurationOption.java
index 6a799f038d9..bf24083729b 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/option/dialect/MariaDBStorageContainerConfigurationOption.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/option/dialect/MariaDBStorageContainerConfigurationOption.java
@@ -51,7 +51,7 @@ public final class MariaDBStorageContainerConfigurationOption
implements Storage
@Override
public Map<String, String> getMountedResources(final int majorVersion) {
Map<String, String> result = new HashMap<>(2, 1F);
- result.put("/container/mysql/cnf/8/my.cnf",
MySQLContainer.MYSQL_CONF_IN_CONTAINER);
+ result.put("/container/mysql/cnf/my.cnf",
MySQLContainer.MYSQL_CONF_IN_CONTAINER);
result.put("/env/mysql/01-initdb.sql",
"/docker-entrypoint-initdb.d/01-initdb.sql");
return result;
}
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/option/dialect/MySQLStorageContainerConfigurationOption.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/option/dialect/MySQLStorageContainerConfigurationOption.java
index f25fff4bbe7..f64e5aad14d 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/option/dialect/MySQLStorageContainerConfigurationOption.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/option/dialect/MySQLStorageContainerConfigurationOption.java
@@ -58,7 +58,7 @@ public final class MySQLStorageContainerConfigurationOption
implements StorageCo
if (null != url) {
result.put("/env/mysql/8/my.cnf",
MySQLContainer.MYSQL_CONF_IN_CONTAINER);
} else {
- result.put("/container/mysql/cnf/8/my.cnf",
MySQLContainer.MYSQL_CONF_IN_CONTAINER);
+ result.put("/container/mysql/cnf/my.cnf",
MySQLContainer.MYSQL_CONF_IN_CONTAINER);
}
return result;
}
@@ -70,7 +70,7 @@ public final class MySQLStorageContainerConfigurationOption
implements StorageCo
if (null != url) {
result.put(String.format("/env/mysql/%s/my.cnf", majorVersion),
MySQLContainer.MYSQL_CONF_IN_CONTAINER);
} else {
- result.put(String.format("/container/mysql/cnf/%s/my.cnf",
majorVersion), MySQLContainer.MYSQL_CONF_IN_CONTAINER);
+ result.put("/container/mysql/cnf/my.cnf",
MySQLContainer.MYSQL_CONF_IN_CONTAINER);
}
result.put("/env/mysql/01-initdb.sql",
"/docker-entrypoint-initdb.d/01-initdb.sql");
if (majorVersion > 5) {
diff --git a/test/e2e/env/src/test/resources/container/mysql/cnf/8/my.cnf
b/test/e2e/env/src/test/resources/container/mysql/cnf/8/my.cnf
deleted file mode 100644
index 5afba273014..00000000000
--- a/test/e2e/env/src/test/resources/container/mysql/cnf/8/my.cnf
+++ /dev/null
@@ -1,34 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-[mysql]
-
-[mysqld]
-character-set-server=utf8mb4
-collation-server=utf8mb4_general_ci
-log-bin=mysql-bin
-binlog-format=row
-binlog-row-image=full
-max_connections=600
-lower_case_table_names=1
-innodb_lock_wait_timeout=5
-default-time-zone='+00:00'
-default-authentication-plugin=mysql_native_password
-sql_mode=STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION
-
-# For MySQL 8.0
-secure_file_priv=/var/lib/mysql
diff --git a/test/e2e/env/src/test/resources/container/mysql/cnf/5/my.cnf
b/test/e2e/env/src/test/resources/container/mysql/cnf/my.cnf
similarity index 100%
rename from test/e2e/env/src/test/resources/container/mysql/cnf/5/my.cnf
rename to test/e2e/env/src/test/resources/container/mysql/cnf/my.cnf
