- default-character-set is client option, not server

Changed files:
    mysql.spec -> 1.532
    mysqld.conf -> 1.55

diff --git a/mysql.spec b/mysql.spec
index 776e77f2aa4c964e9a786b9ee5bf48d15f5f37e5..55f1fe60d28025cbb6891d1ee0a26eb013f7bba9 100644 (file)
--- a/mysql.spec
+++ b/mysql.spec
@@ -941,7 +941,8 @@ for config in $configs; do
                s/^language *= *polish/lc-messages = pl_PL/i
                s/set-variable\s*=\s* //
                /^skip-locking/skip-external-locking/
-               s/default-character-set/character-set-server/
+               # this is not valid for server. it is client option
+               s/default-character-set/# client-config: &/
        ' $config
 done
 

diff --git a/mysqld.conf b/mysqld.conf
index 8765eba71b88b2246e43ad8006e7da3197915786..66fe921539602c0add4e0aa58778b20b36caa69d 100644 (file)
--- a/mysqld.conf
+++ b/mysqld.conf
@@ -23,9 +23,6 @@ user        = mysql
 #collation-server=latin2_general_ci
 #skip-character-set-client-handshake
 
-# set default charset
-#default-character-set = latin1
-
 # Use passwords compatible with old 4.0 mysqld
 #old-passwords