Merge branch 'master' into dist/eole/2.6.2/master
This commit is contained in:
commit
d9425736c6
|
@ -2,7 +2,6 @@
|
||||||
<files>
|
<files>
|
||||||
<file filelist='dbMariaDB' name='/etc/mysql/conf.d/mariadb.cnf' rm='True' mkdir='True'/>
|
<file filelist='dbMariaDB' name='/etc/mysql/conf.d/mariadb.cnf' rm='True' mkdir='True'/>
|
||||||
<file filelist='dbCluster' name='/etc/mysql/conf.d/galera.cnf' rm='True' mkdir='True'/>
|
<file filelist='dbCluster' name='/etc/mysql/conf.d/galera.cnf' rm='True' mkdir='True'/>
|
||||||
<file filelist='dbCluster' name='/etc/mysql/conf.d/galera.cnf' rm='True' mkdir='True'/>
|
|
||||||
|
|
||||||
<file filelist='dbTunning' name='/etc/mysql/conf.d/tunning.cnf' rm='True' mkdir='True'/>
|
<file filelist='dbTunning' name='/etc/mysql/conf.d/tunning.cnf' rm='True' mkdir='True'/>
|
||||||
<service servicelist='bdd'>mariadb</service>
|
<service servicelist='bdd'>mariadb</service>
|
||||||
|
|
|
@ -0,0 +1,21 @@
|
||||||
|
# MariaDB-specific config file.
|
||||||
|
# Read by /etc/mysql/my.cnf
|
||||||
|
|
||||||
|
[client]
|
||||||
|
# Default is Latin1, if you need UTF-8 set this (also in server section)
|
||||||
|
#default-character-set = utf8
|
||||||
|
|
||||||
|
[mysqld]
|
||||||
|
#
|
||||||
|
# * Character sets
|
||||||
|
#
|
||||||
|
# Default is Latin1, if you need UTF-8 set all this (also in client section)
|
||||||
|
#
|
||||||
|
#character-set-server = utf8
|
||||||
|
#collation-server = utf8_general_ci
|
||||||
|
#character_set_server = utf8
|
||||||
|
#collation_server = utf8_general_ci
|
||||||
|
# Import all .cnf files from configuration directory
|
||||||
|
plugin-load-add = auth_socket.so
|
||||||
|
!includedir /etc/mysql/mariadb.conf.d/
|
||||||
|
|
Loading…
Reference in New Issue