- upgrade trigger: mysql_upgrade works remotely, so --datadir is not used, use -...

Changed files:
    mysql.spec -> 1.560

diff --git a/mysql.spec b/mysql.spec
index 78be40ad8bc4af68e220e6c65981f7104b1d7961..2887e47066717b8ac54ba5da668d2ba6069d93fa 100644 (file)
--- a/mysql.spec
+++ b/mysql.spec
@@ -969,13 +969,13 @@ for config in $configs; do
                s/set-variable\s*=\s* //
                s/^skip-locking/skip-external-locking/
                # this is not valid for server. it is client option
-               s/default-character-set/# client-config: &/
+               s/^default-character-set/# client-config: &/
                # use # as comment in config
                s/^;/#/
        ' $config
 
-       datadir=$(awk -F= '!/^#/ && $1 ~ /datadir/{print $2}' $config | xargs)
-       echo "# mysql_upgrade --datadir=$datadir"
+       socket=$(awk -F= '!/^#/ && $1 ~ /socket/{print $2}' $config | xargs)
+       echo "# mysql_upgrade ${socket:+--socket=$socket}"
 done
 ) | %banner -e %{name}-5.5