packages: mysql/mysqld.conf, mysql/mysql.spec - default-character-set is cl...

[glen]

Author: glen                         Date: Thu Mar 10 08:11:48 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- default-character-set is client option, not server

---- Files affected:
packages/mysql:
   mysqld.conf (1.54 -> 1.55) , mysql.spec (1.531 -> 1.532) 

---- Diffs:

================================================================
Index: packages/mysql/mysqld.conf
diff -u packages/mysql/mysqld.conf:1.54 packages/mysql/mysqld.conf:1.55
--- packages/mysql/mysqld.conf:1.54	Wed Feb 16 17:26:24 2011
+++ packages/mysql/mysqld.conf	Thu Mar 10 09:11:42 2011
@@ -23,9 +23,6 @@
 #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
 

================================================================
Index: packages/mysql/mysql.spec
diff -u packages/mysql/mysql.spec:1.531 packages/mysql/mysql.spec:1.532
--- packages/mysql/mysql.spec:1.531	Thu Mar 10 09:08:58 2011
+++ packages/mysql/mysql.spec	Thu Mar 10 09:11:42 2011
@@ -942,7 +942,8 @@
 		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
 
@@ -1216,6 +1217,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.532  2011/03/10 08:11:42  glen
+- default-character-set is client option, not server
+
 Revision 1.531  2011/03/10 08:08:58  glen
 - skip-locking was renamed, not removed
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysqld.conf?r1=1.54&r2=1.55&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql.spec?r1=1.531&r2=1.532&f=u