mysql3 is not yet discontinued, so merge changes from other mysql packages

mysql3/mysql3.spec

@@ -38,7 +38,7 @@ Class:        EVAL
 Group:        Database
 License:      GPL
 Version:      %{V_major}.%{V_minor}
-Release:      20040912
+Release:      20041109
 
 #   package options
 %option       with_bdb         yes
@@ -209,8 +209,8 @@ Provides:     mysql = %{version}-%{release}
     #   determine the package files
     %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
         %{l_files_std} \
-        '%config %{l_prefix}/etc/mysql/my.cnf' \
-        '%config %{l_prefix}/etc/mysql/my.pwd' \
+        '%config %attr(644,%{l_musr},%{l_mgrp}) %{l_prefix}/etc/mysql/my.cnf' \
+        '%config %attr(600,%{l_susr},%{l_mgrp}) %{l_prefix}/etc/mysql/my.pwd' \
         '%attr(-,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/mysql'
 
 %files -f files
@@ -230,9 +230,6 @@ Provides:     mysql = %{version}-%{release}
     #   after install, create initial database
     $RPM_INSTALL_PREFIX/bin/mysql_install_db \
         --defaults-file=$RPM_INSTALL_PREFIX/etc/mysql/my.cnf
-    chown %{l_rusr}:%{l_rgrp} \
-        $RPM_INSTALL_PREFIX/etc/mysql/my.cnf \
-        $RPM_INSTALL_PREFIX/etc/mysql/my.pwd
     chown -R %{l_rusr}:%{l_rgrp} $RPM_INSTALL_PREFIX/var/mysql/*
     ( echo "The MySQL package includes automated maintenance procedures"
       echo "that require administrator access to the database. For this"

mysql3/rc.mysql3

@@ -52,7 +52,7 @@
         --pid-file="$mysql3_pid_file" \
         --err-log="$mysql3_log_err" &
 
-%stop -p 400 -u @l_rusr@
+%stop -p 400 -u @l_susr@
     rcService mysql3 enable yes || exit 0
     rcService mysql3 active no  && exit 0
     @l_prefix@/bin/mysqladmin \