Author: glen                         Date: Tue Oct 18 17:57:07 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- upgrade trigger: mysql_upgrade works remotely, so --datadir is not used, use 
--socket instead

---- Files affected:
packages/mysql:
   mysql.spec (1.559 -> 1.560) 

---- Diffs:

================================================================
Index: packages/mysql/mysql.spec
diff -u packages/mysql/mysql.spec:1.559 packages/mysql/mysql.spec:1.560
--- packages/mysql/mysql.spec:1.559     Thu Sep  8 20:24:14 2011
+++ packages/mysql/mysql.spec   Tue Oct 18 19:57:02 2011
@@ -970,13 +970,13 @@
                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
 
@@ -1250,6 +1250,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.560  2011/10/18 17:57:02  glen
+- upgrade trigger: mysql_upgrade works remotely, so --datadir is not used, use 
--socket instead
+
 Revision 1.559  2011/09/08 18:24:14  arekm
 - rel 3; update percona patches
 
================================================================

---- CVS-web:
    
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql.spec?r1=1.559&r2=1.560&f=u

_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to