Builds, inits db and starts

diff --git a/mysql.init b/mysql.init
index 1743a6c8d7fefbd098e0d28cdf03169c65cf236b..cb0f1a237d50fca3b0a98fd97ca79cac3aeab1f0 100755 (executable)
--- a/mysql.init
+++ b/mysql.init
@@ -477,17 +477,16 @@ mysqlinit() {
                --skip-grant-tables \
                --datadir=$MYSQL_DATA_DIR \
                --user=$MYSQL_USER \
-               --slave-load-tmpdir=$MYSQL_DATA_DIR \
                --tmpdir=$MYSQL_DATA_DIR \
                --log-error=$MYSQL_ERRLOG \
                && ok=1
-       [ -f $MYSQL_DATA_DIR/mysql/user.frm ] || ok=0
+       [ -f $MYSQL_DATA_DIR/mysql.ibd ] || ok=0
 
        if [ "$ok" = 1 ]; then
                ok
                cat << END_OF_MSG
 
-PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL{MYSQL_MAJOR} USERS!
+PLEASE REMEMBER TO CHANGE A PASSWORD FOR THE MySQL{MYSQL_MAJOR} USERS!
 
 Start database:
 $ service mysql{MYSQL_MAJOR} start
@@ -498,9 +497,9 @@ For 'root' user (ALL privileges, DB admin), paste command with new password:
 ALTER USER 'root'@'localhost' IDENTIFIED BY 'newpassword';
 FLUSH PRIVILEGES;
 
-For 'mysql_sysadmin' (RELOAD and SHUTDOWN privileges):
+For 'mysql_sysadmin' (RELOAD, SHUTDOWN and REPLICATION CLIENT privileges):
 CREATE USER 'mysql_sysadmin'@'localhost' IDENTIFIED BY 'sysnewpassword' PASSWORD EXPIRE NEVER;
-GRANT RELOAD, SHUTDOWN ON *.* TO 'mysql_sysadmin'@'localhost';
+GRANT RELOAD, SHUTDOWN, REPLICATION CLIENT ON *.* TO 'mysql_sysadmin'@'localhost';
 FLUSH PRIVILEGES;
 
 
@@ -555,8 +554,8 @@ END_OF_MSG
        fi
 
        # if it's first server, register as default
-       if [ ! -e /var/lib/mysql{MYSQL_MAJOR}/mysql.sock ] || [ -L /var/lib/mysql{MYSQL_MAJOR}/mysql.sock ] && [ -z "$(readlink /var/lib/mysql/mysql.sock)" ]; then
-               sock=${MYSQL_SOCKET#/var/lib/mysql/} # make it relative if possible
+       if [ ! -e /var/lib/mysql{MYSQL_MAJOR}/mysql.sock ] || [ -L /var/lib/mysql{MYSQL_MAJOR}/mysql.sock ] && [ -z "$(readlink /var/lib/mysql{MYSQL_MAJOR}/mysql.sock)" ]; then
+               sock=${MYSQL_SOCKET#/var/lib/mysql{MYSQL_MAJOR}/} # make it relative if possible
                ln -s "$sock" /var/lib/mysql{MYSQL_MAJOR}/mysql.sock
        fi
        # same for config, move to /etc

diff --git a/mysql.spec b/mysql.spec
index 55956dd4cbc18fa8612be03daa8ac9e6862b8610..915e4211d4dea3309972f0c2cb626a6dded35631 100644 (file)
--- a/mysql.spec
+++ b/mysql.spec
@@ -520,6 +520,7 @@ CPPFLAGS="%{rpmcppflags}" \
         -DINSTALL_PRIV_LIBDIR=%{_libdir}/%{name}/private \
        -DINSTALL_MYSQLTESTDIR_RPM="" \
        -DINSTALL_PLUGINDIR=%{_lib}/%{name}/plugin \
+        -DINSTALL_SECURE_FILE_PRIVDIR=/var/lib/%{name}-files \
        -DINSTALL_SQLBENCHDIR=%{_datadir} \
        -DINSTALL_SUPPORTFILESDIR=share/%{name}-support \
        -DINSTALL_MYSQLSHAREDIR=share/%{name} \
@@ -553,7 +554,7 @@ CPPFLAGS="%{rpmcppflags}" \
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/etc/{logrotate.d,rc.d/init.d,sysconfig,%{name},skel} \
-          $RPM_BUILD_ROOT/var/{log/{archive,}/%{name},lib/{mysql,%{name}-files}} \
+          $RPM_BUILD_ROOT/var/{log/{archive,}/%{name},lib/{%{name},%{name}-files}} \
           $RPM_BUILD_ROOT%{_mysqlhome} \
           $RPM_BUILD_ROOT%{_libdir}
 
@@ -831,7 +832,8 @@ fi
 
 %attr(700,mysql,mysql) %{_mysqlhome}
 # root:root is proper here for mysql.rpm while mysql:mysql is potential security hole
-%attr(751,root,root) /var/lib/mysql
+%attr(751,root,root) /var/lib/%{name}
+%attr(750,mysql,mysql) %dir /var/lib/%{name}-files
 %attr(750,mysql,mysql) %dir /var/log/%{name}
 %attr(750,mysql,mysql) %dir /var/log/archive/%{name}
 %attr(640,mysql,mysql) %ghost /var/log/%{name}/*