Skip to content

Commit 226fd11

Browse files
authored
Use utf8mb4 as default (hestiacp#3337)
1 parent dbd67f4 commit 226fd11

File tree

4 files changed

+25
-4
lines changed

4 files changed

+25
-4
lines changed

bin/v-add-database

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ password=$4
2424
HIDE=4
2525
type=${5-mysql}
2626
host=$6
27-
charset=${7-UTF8}
27+
charset=${7-UTF8MB4}
2828
charset=$(echo "$charset" | tr '[:lower:]' '[:upper:]')
2929

3030
# Includes

install/deb/mysql/my-large.cnf

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
[client]
22
port=3306
33
socket=/run/mysqld/mysqld.sock
4+
default-character-set=utf8mb4
5+
6+
[mysql]
7+
default-character-set=utf8mb4
48

59
[mysqld_safe]
610
socket=/run/mysqld/mysqld.sock
@@ -15,6 +19,9 @@ datadir=/var/lib/mysql
1519
tmpdir=/tmp
1620
lc-messages-dir=/usr/share/mysql
1721
log_error=/var/log/mysql/error.log
22+
collation-server = utf8mb4_unicode_520_ci
23+
init-connect='SET NAMES utf8mb4'
24+
character-set-server = utf8mb4
1825

1926
symbolic-links=0
2027
local-infile=0
@@ -40,4 +47,4 @@ interactive_timeout=50
4047
long_query_time=5
4148

4249
!includedir /etc/mysql/conf.d/
43-
!includedir /etc/mysql/mariadb.conf.d/
50+
!includedir /etc/mysql/mariadb.conf.d/

install/deb/mysql/my-medium.cnf

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
[client]
22
port=3306
33
socket=/run/mysqld/mysqld.sock
4+
default-character-set=utf8mb4
5+
6+
[mysql]
7+
default-character-set=utf8mb4
48

59
[mysqld_safe]
610
socket=/run/mysqld/mysqld.sock
@@ -15,6 +19,9 @@ datadir=/var/lib/mysql
1519
tmpdir=/tmp
1620
lc-messages-dir=/usr/share/mysql
1721
log_error=/var/log/mysql/error.log
22+
collation-server = utf8mb4_unicode_520_ci
23+
init-connect='SET NAMES utf8mb4'
24+
character-set-server = utf8mb4
1825

1926
symbolic-links=0
2027
local-infile=0
@@ -39,4 +46,4 @@ interactive_timeout=50
3946
long_query_time=5
4047

4148
!includedir /etc/mysql/conf.d/
42-
!includedir /etc/mysql/mariadb.conf.d/
49+
!includedir /etc/mysql/mariadb.conf.d/

install/deb/mysql/my-small.cnf

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
[client]
22
port=3306
33
socket=/run/mysqld/mysqld.sock
4+
default-character-set=utf8mb4
5+
6+
[mysql]
7+
default-character-set=utf8mb4
48

59
[mysqld_safe]
610
socket=/run/mysqld/mysqld.sock
@@ -15,6 +19,9 @@ datadir=/var/lib/mysql
1519
tmpdir=/tmp
1620
lc-messages-dir=/usr/share/mysql
1721
log_error=/var/log/mysql/error.log
22+
collation-server = utf8mb4_unicode_520_ci
23+
init-connect='SET NAMES utf8mb4'
24+
character-set-server = utf8mb4
1825

1926
symbolic-links=0
2027
local-infile=0
@@ -39,4 +46,4 @@ interactive_timeout=50
3946
long_query_time=5
4047

4148
!includedir /etc/mysql/conf.d/
42-
!includedir /etc/mysql/mariadb.conf.d/
49+
!includedir /etc/mysql/mariadb.conf.d/

0 commit comments

Comments
 (0)