- more mysqld.conf changes: skip-locking, default-character-set

Changed files:
    mysql.spec -> 1.530

diff --git a/mysql.spec b/mysql.spec
index 76a73e6b5e964ca068e82cbf8c3c0f3bb7a7e709..cb0170520ab737fa730bfd5c83ff331584439332 100644 (file)
--- a/mysql.spec
+++ b/mysql.spec
@@ -905,7 +905,7 @@ echo 'You should run MySQL upgrade script *after* restarting MySQL server for al
 echo 'Thus, you should invoke:'
 for config in $configs; do
        sed -i -e '
-               #set-variable\s*=\s* ##
+               s/set-variable\s*=\s* //
        ' $config
 
        datadir=$(awk -F= '!/^#/ && $1 ~ /datadir/{print $2}' $config | xargs)
@@ -938,8 +938,10 @@ done
 
 for config in $configs; do
        sed -i -e '
-               s#^language *= *polish#lc-messages = pl_PL#gi
-               #set-variable\s*=\s* ##
+               s/^language *= *polish/lc-messages = pl_PL/i
+               s/set-variable\s*=\s* //
+               /^skip-locking/; removed: &/
+               s/default-character-set/character-set-server/
        ' $config
 done