This is an automated email from the ASF dual-hosted git repository.
zykkk pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.1 by this push:
new bc70968019c [chore](regression) Modify character encoding to be
consistent with Doris (#35228)
bc70968019c is described below
commit bc70968019cbb69f21b960fce9a868d740762460
Author: zgxme <m...@zgx.io>
AuthorDate: Wed May 22 20:04:50 2024 +0800
[chore](regression) Modify character encoding to be consistent with Doris
(#35228)
---
docker/thirdparties/docker-compose/mysql/my.cnf | 22 ++++++++++++++++++++++
.../docker-compose/mysql/mysql-5.7.yaml.tpl | 1 +
2 files changed, 23 insertions(+)
diff --git a/docker/thirdparties/docker-compose/mysql/my.cnf
b/docker/thirdparties/docker-compose/mysql/my.cnf
new file mode 100644
index 00000000000..e1bd008dd24
--- /dev/null
+++ b/docker/thirdparties/docker-compose/mysql/my.cnf
@@ -0,0 +1,22 @@
+#
+# 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.
+[mysqld]
+character-set-server=utf8
+collation-server=utf8_bin
+[client]
+default-character-set=utf8
+[mysql]
+default-character-set=utf8
\ No newline at end of file
diff --git a/docker/thirdparties/docker-compose/mysql/mysql-5.7.yaml.tpl
b/docker/thirdparties/docker-compose/mysql/mysql-5.7.yaml.tpl
index 1845bfa4ec1..6c6ad81e411 100644
--- a/docker/thirdparties/docker-compose/mysql/mysql-5.7.yaml.tpl
+++ b/docker/thirdparties/docker-compose/mysql/mysql-5.7.yaml.tpl
@@ -37,6 +37,7 @@ services:
volumes:
- ./data/:/var/lib/mysql
- ./init:/docker-entrypoint-initdb.d
+ - ./my.cnf:/etc/mysql/conf.d/my.cnf
networks:
- doris--mysql_57
doris--mysql-hello-world:
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
