- trim out obsolete set-variable. unsupported in 5.5

Changed files:
    mysql.spec -> 1.529

diff --git a/mysql.spec b/mysql.spec
index ae914891142b07e38b58c7d6548806c7b33ac34b..76a73e6b5e964ca068e82cbf8c3c0f3bb7a7e709 100644 (file)
--- a/mysql.spec
+++ b/mysql.spec
@@ -901,14 +901,16 @@ for config in $(awk -F= '!/^#/ && /=/{print $1}' /etc/%{name}/clusters.conf); do
        configs="$configs $config_file"
 done
 
-(
 echo 'You should run MySQL upgrade script *after* restarting MySQL server for all MySQL clusters.'
 echo 'Thus, you should invoke:'
 for config in $configs; do
+       sed -i -e '
+               #set-variable\s*=\s* ##
+       ' $config
+
        datadir=$(awk -F= '!/^#/ && $1 ~ /datadir/{print $2}' $config | xargs)
        echo "# mysql_upgrade --datadir=$datadir"
 done
-) | %banner -e %{name}-5.1
 
 %triggerpostun -- mysql < 5.5.0
 configs=""
@@ -935,7 +937,10 @@ for config in $(awk -F= '!/^#/ && /=/{print $1}' /etc/%{name}/clusters.conf); do
 done
 
 for config in $configs; do
-       sed -i -e 's#^language *= *polish#lc-messages = pl_PL#gi' $config
+       sed -i -e '
+               s#^language *= *polish#lc-messages = pl_PL#gi
+               #set-variable\s*=\s* ##
+       ' $config
 done
 
 %files