mirror of
https://github.com/MariaDB/server.git
synced 2025-01-22 06:44:16 +01:00
setup fixes
This commit is contained in:
parent
1815de7b55
commit
0eddb07ff7
4 changed files with 10 additions and 8 deletions
|
@ -19,6 +19,7 @@
|
|||
|
||||
EXTRA_DIST = mysql.spec.sh \
|
||||
my-small.cnf.sh \
|
||||
my.cnf \
|
||||
my-medium.cnf.sh \
|
||||
my-large.cnf.sh \
|
||||
my-huge.cnf.sh \
|
||||
|
|
2
support-files/my.cnf
Normal file
2
support-files/my.cnf
Normal file
|
@ -0,0 +1,2 @@
|
|||
[mysqld]
|
||||
port=3307
|
|
@ -136,6 +136,9 @@ else
|
|||
esac
|
||||
fi
|
||||
|
||||
user=@MYSQLD_USER@
|
||||
USER_OPTION="--user=$user"
|
||||
|
||||
# Safeguard (relative paths, core dumps..)
|
||||
cd $basedir
|
||||
|
||||
|
@ -147,7 +150,7 @@ case "$mode" in
|
|||
then
|
||||
# Give extra arguments to mysqlmanager with the my.cnf file. This script may
|
||||
# be overwritten at next upgrade.
|
||||
$sbindir/mysqlmanager "--pid-file=$pid_file" --run-as-service >/dev/null 2>&1 &
|
||||
$sbindir/mysqlmanager "--pid-file=$pid_file" $USER_OPTION --run-as-service >/dev/null 2>&1 &
|
||||
# Make lock for RedHat / SuSE
|
||||
if test -w /var/lock/subsys
|
||||
then
|
||||
|
|
|
@ -362,8 +362,9 @@ install -s -m755 $MBD/sql/mysqld-max $RBR%{_sbindir}/mysqld-max
|
|||
install -m644 $MBD/sql/mysqld-max.sym $RBR%{_libdir}/mysql/mysqld-max.sym
|
||||
install -m644 $MBD/sql/mysqld.sym $RBR%{_libdir}/mysql/mysqld.sym
|
||||
|
||||
# Install logrotate and autostart
|
||||
# Install logrotate, autostart and config file
|
||||
install -m644 $MBD/support-files/mysql-log-rotate $RBR%{_sysconfdir}/logrotate.d/mysql
|
||||
install -m644 $MBD/support-files/my.cnf $RBR%{_sysconfdir}/my.cnf
|
||||
install -m755 $MBD/support-files/mysql.server $RBR%{_sysconfdir}/init.d/mysql
|
||||
|
||||
# Create a symlink "rcmysql", pointing to the init.script. SuSE users
|
||||
|
@ -374,10 +375,6 @@ ln -s %{_sysconfdir}/init.d/mysql $RPM_BUILD_ROOT%{_sbindir}/rcmysql
|
|||
# (safe_mysqld will be gone in MySQL 4.1)
|
||||
ln -sf ./mysqld_safe $RBR%{_bindir}/safe_mysqld
|
||||
|
||||
# Touch the place where the my.cnf config file might be located
|
||||
# Just to make sure it's in the file list and marked as a config file
|
||||
touch $RBR%{_sysconfdir}/my.cnf
|
||||
|
||||
%pre server
|
||||
# Shut down a previously installed server first
|
||||
if test -x %{_sysconfdir}/init.d/mysql
|
||||
|
@ -486,8 +483,6 @@ fi
|
|||
%doc %attr(644, root, man) %{_mandir}/man1/perror.1*
|
||||
%doc %attr(644, root, man) %{_mandir}/man1/replace.1*
|
||||
|
||||
%ghost %config(noreplace,missingok) %{_sysconfdir}/my.cnf
|
||||
|
||||
%attr(755, root, root) %{_bindir}/my_print_defaults
|
||||
%attr(755, root, root) %{_bindir}/myisamchk
|
||||
%attr(755, root, root) %{_bindir}/myisam_ftdump
|
||||
|
@ -520,6 +515,7 @@ fi
|
|||
%attr(644, root, root) %{_libdir}/mysql/mysqld.sym
|
||||
|
||||
%attr(644, root, root) %config(noreplace,missingok) %{_sysconfdir}/logrotate.d/mysql
|
||||
%attr(644, root, root) %config(noreplace,missingok) %{_sysconfdir}/my.cnf
|
||||
%attr(755, root, root) %{_sysconfdir}/init.d/mysql
|
||||
|
||||
%attr(755, root, root) %{_datadir}/mysql/
|
||||
|
|
Loading…
Add table
Reference in a new issue