Parcourir la source

Use utf8mb4 as default (#3337)

Jaap Marcus il y a 3 ans
Parent
commit
226fd11fd5

+ 1 - 1
bin/v-add-database

@@ -24,7 +24,7 @@ password=$4
 HIDE=4
 type=${5-mysql}
 host=$6
-charset=${7-UTF8}
+charset=${7-UTF8MB4}
 charset=$(echo "$charset" | tr '[:lower:]' '[:upper:]')
 
 # Includes

+ 8 - 1
install/deb/mysql/my-large.cnf

@@ -1,6 +1,10 @@
 [client]
 port=3306
 socket=/run/mysqld/mysqld.sock
+default-character-set=utf8mb4
+
+[mysql]
+default-character-set=utf8mb4
 
 [mysqld_safe]
 socket=/run/mysqld/mysqld.sock
@@ -15,6 +19,9 @@ datadir=/var/lib/mysql
 tmpdir=/tmp
 lc-messages-dir=/usr/share/mysql
 log_error=/var/log/mysql/error.log
+collation-server = utf8mb4_unicode_520_ci
+init-connect='SET NAMES utf8mb4'
+character-set-server = utf8mb4
 
 symbolic-links=0
 local-infile=0
@@ -40,4 +47,4 @@ interactive_timeout=50
 long_query_time=5
 
 !includedir /etc/mysql/conf.d/
-!includedir /etc/mysql/mariadb.conf.d/
+!includedir /etc/mysql/mariadb.conf.d/

+ 8 - 1
install/deb/mysql/my-medium.cnf

@@ -1,6 +1,10 @@
 [client]
 port=3306
 socket=/run/mysqld/mysqld.sock
+default-character-set=utf8mb4
+
+[mysql]
+default-character-set=utf8mb4
 
 [mysqld_safe]
 socket=/run/mysqld/mysqld.sock
@@ -15,6 +19,9 @@ datadir=/var/lib/mysql
 tmpdir=/tmp
 lc-messages-dir=/usr/share/mysql
 log_error=/var/log/mysql/error.log
+collation-server = utf8mb4_unicode_520_ci
+init-connect='SET NAMES utf8mb4'
+character-set-server = utf8mb4
 
 symbolic-links=0
 local-infile=0
@@ -39,4 +46,4 @@ interactive_timeout=50
 long_query_time=5
 
 !includedir /etc/mysql/conf.d/
-!includedir /etc/mysql/mariadb.conf.d/
+!includedir /etc/mysql/mariadb.conf.d/

+ 8 - 1
install/deb/mysql/my-small.cnf

@@ -1,6 +1,10 @@
 [client]
 port=3306
 socket=/run/mysqld/mysqld.sock
+default-character-set=utf8mb4
+
+[mysql]
+default-character-set=utf8mb4
 
 [mysqld_safe]
 socket=/run/mysqld/mysqld.sock
@@ -15,6 +19,9 @@ datadir=/var/lib/mysql
 tmpdir=/tmp
 lc-messages-dir=/usr/share/mysql
 log_error=/var/log/mysql/error.log
+collation-server = utf8mb4_unicode_520_ci
+init-connect='SET NAMES utf8mb4'
+character-set-server = utf8mb4
 
 symbolic-links=0
 local-infile=0
@@ -39,4 +46,4 @@ interactive_timeout=50
 long_query_time=5
 
 !includedir /etc/mysql/conf.d/
-!includedir /etc/mysql/mariadb.conf.d/
+!includedir /etc/mysql/mariadb.conf.d/