summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2012-05-30 19:11:59 +0200
committerSergei Golubchik <sergii@pisem.net>2012-05-30 19:11:59 +0200
commit648c8c2619f926cb9d0c298e59013973f9c55f78 (patch)
tree22dff4ac5c2bb6ab0d217f2f9ee489feda1e41ac /debian
parent32addeaf45237806ea1722ad7c680c58633605ac (diff)
downloadmariadb-git-648c8c2619f926cb9d0c298e59013973f9c55f78.tar.gz
don't use deprecated options in the installed config files
Diffstat (limited to 'debian')
-rw-r--r--debian/additions/mariadb.cnf6
1 files changed, 3 insertions, 3 deletions
diff --git a/debian/additions/mariadb.cnf b/debian/additions/mariadb.cnf
index 6c2d812f0cc..e3803c4aaeb 100644
--- a/debian/additions/mariadb.cnf
+++ b/debian/additions/mariadb.cnf
@@ -3,7 +3,7 @@
[client]
# Default is Latin1, if you need UTF-8 set this (also in server section)
-#default-character-set = utf8
+#character-set-server = utf8
[mysqld]
#
@@ -11,7 +11,7 @@
#
# Default is Latin1, if you need UTF-8 set all this (also in client section)
#
-#default-character-set = utf8
-#default-collation = utf8_general_ci
+#character-set-server = utf8
+#collation-server = utf8_general_ci
#character_set_server = utf8
#collation_server = utf8_general_ci