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 ab3e9912f74 Refactor my.cnf (#36490)
ab3e9912f74 is described below
commit ab3e9912f749a34d73da922e30d599b231120e45
Author: Liang Zhang <[email protected]>
AuthorDate: Sat Sep 6 17:45:44 2025 +0800
Refactor my.cnf (#36490)
* Remove shardingsphere-test-e2e-showprocesslist's my.cnf
* Refactor my.cnf
---
test/e2e/env/src/test/resources/container/mysql/cnf/5/my.cnf | 7 +++++--
test/e2e/env/src/test/resources/container/mysql/cnf/8/my.cnf | 6 +++---
test/e2e/operation/pipeline/src/test/resources/env/mysql/5/my.cnf | 4 +++-
test/e2e/operation/pipeline/src/test/resources/env/mysql/8/my.cnf | 7 +++++--
4 files changed, 16 insertions(+), 8 deletions(-)
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/5/my.cnf
index 7e6cc3bf1ef..750e262444a 100644
--- a/test/e2e/env/src/test/resources/container/mysql/cnf/5/my.cnf
+++ b/test/e2e/env/src/test/resources/container/mysql/cnf/5/my.cnf
@@ -18,11 +18,14 @@
[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
-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
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
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
index d5c1fd1d3b1..5afba273014 100644
--- 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
@@ -24,11 +24,11 @@ log-bin=mysql-bin
binlog-format=row
binlog-row-image=full
max_connections=600
-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
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
+# For MySQL 8.0
secure_file_priv=/var/lib/mysql
diff --git a/test/e2e/operation/pipeline/src/test/resources/env/mysql/5/my.cnf
b/test/e2e/operation/pipeline/src/test/resources/env/mysql/5/my.cnf
index ce7a88e66a4..5e034f5c393 100644
--- a/test/e2e/operation/pipeline/src/test/resources/env/mysql/5/my.cnf
+++ b/test/e2e/operation/pipeline/src/test/resources/env/mysql/5/my.cnf
@@ -24,6 +24,8 @@ 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=
-lower_case_table_names=1
diff --git a/test/e2e/operation/pipeline/src/test/resources/env/mysql/8/my.cnf
b/test/e2e/operation/pipeline/src/test/resources/env/mysql/8/my.cnf
index 7b3f4b045e3..7bfabebe18a 100644
--- a/test/e2e/operation/pipeline/src/test/resources/env/mysql/8/my.cnf
+++ b/test/e2e/operation/pipeline/src/test/resources/env/mysql/8/my.cnf
@@ -24,8 +24,11 @@ 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=caching_sha2_password
sql_mode=
-lower_case_table_names=1
+
+# For MySQL 8.0
secure_file_priv=/var/lib/mysql
-default-time-zone='+00:00'
