This repository was archived by the owner on Aug 29, 2018. It is now read-only.
File tree 2 files changed +12
-1
lines changed
cartridges/openshift-origin-cartridge-mysql
2 files changed +12
-1
lines changed Original file line number Diff line number Diff line change @@ -11,7 +11,7 @@ password=$OPENSHIFT_MYSQL_DB_PASSWORD
11
11
# TODO: Should be we running mysql_secure_installation
12
12
13
13
echo " drop database test;
14
- create database \` ${dbname} \` DEFAULT CHARACTER SET utf8 DEFAULT COLLATE utf8_general_ci ;" | mysql_context " /usr/bin/mysql -u root -S '$socket_file '" > /dev/null || error ' Failed to create database' 188
14
+ create database \` ${dbname} \` DEFAULT CHARACTER SET utf8mb4 DEFAULT COLLATE utf8mb4_unicode_ci ;" | mysql_context " /usr/bin/mysql -u root -S '$socket_file '" > /dev/null || error ' Failed to create database' 188
15
15
16
16
echo "
17
17
delete from user;
Original file line number Diff line number Diff line change 8
8
# max_connections -> OPENSHIFT_MYSQL_MAX_CONNECTIONS
9
9
# ft_min_word_len -> OPENSHIFT_MYSQL_FT_MIN_WORD_LEN
10
10
# ft_max_word_len -> OPENSHIFT_MYSQL_FT_MAX_WORD_LEN
11
+ # default-character-set -> OPENSHIFT_MYSQL_DEFAULT_CHARACTER_SET
12
+ # character-set-server -> OPENSHIFT_MYSQL_CHARACTER_SET_SERVER
13
+ # collation-server -> OPENSHIFT_MYSQL_COLLATION_SERVER
14
+ # character-set-client-handshake -> OPENSHIFT_MYSQL_CHARACTER_SET_CLIENT_HANDSHAKE
15
+
16
+ [client]
17
+ default-character-set = <%= ENV [ 'OPENSHIFT_MYSQL_DEFAULT_CHARACTER_SET' ] ? ENV [ 'OPENSHIFT_MYSQL_DEFAULT_CHARACTER_SET' ] : 'utf8mb4' %>
11
18
12
19
[mysqld]
20
+ character-set-server = <%= ENV [ 'OPENSHIFT_MYSQL_CHARACTER_SET_SERVER' ] ? ENV [ 'OPENSHIFT_MYSQL_CHARACTER_SET_SERVER' ] : 'utf8mb4' %>
21
+ collation-server = <%= ENV [ 'OPENSHIFT_MYSQL_COLLATION_SERVER' ] ? ENV [ 'OPENSHIFT_MYSQL_COLLATION_SERVER' ] : 'utf8mb4_unicode_ci' %>
22
+ character-set-client-handshake = <%= ENV [ 'OPENSHIFT_MYSQL_CHARACTER_SET_CLIENT_HANDSHAKE' ] ? ENV [ 'OPENSHIFT_MYSQL_CHARACTER_SET_CLIENT_HANDSHAKE' ] : 'TRUE' %>
13
23
datadir=<%= ENV [ 'OPENSHIFT_MYSQL_DIR' ] %> data/
14
24
socket=<%= ENV [ 'OPENSHIFT_MYSQL_DB_SOCKET' ] %>
15
25
# Disable reverse DNS resolving of gear ip BZ#1051348
@@ -61,6 +71,7 @@ max_allowed_packet = 16M
61
71
62
72
[mysql]
63
73
no-auto-rehash
74
+ default-character-set = <%= ENV [ 'OPENSHIFT_MYSQL_DEFAULT_CHARACTER_SET' ] ? ENV [ 'OPENSHIFT_MYSQL_DEFAULT_CHARACTER_SET' ] : 'utf8mb4' %>
64
75
# Remove the next comment character if you are not familiar with SQL
65
76
#safe-updates
66
77
You can’t perform that action at this time.
0 commit comments