database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0

Browse Source 
into  mysql.com:/Users/kent/mysql/bk/mysql-4.1
This commit is contained in:
kent@mysql.com/c-4b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
2006-07-28 23:40:05 +02:00
parent 4e845cccc4 2faea98324
commit 01f5bc3a83
4 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
configure.in
View File

@ -2380,12 +2380,16 @@ then
man_dirs="man" man_dirs="man"
man1_files=`ls -1 $srcdir/man/*.1 | sed -e 's;^.*man/;;'` man1_files=`ls -1 $srcdir/man/*.1 | sed -e 's;^.*man/;;'`
man1_files=`echo $man1_files` man1_files=`echo $man1_files`
man8_files=`ls -8 $srcdir/man/*.8 | sed -e 's;^.*man/;;'`
man8_files=`echo $man8_files`
else else
man_dirs="" man_dirs=""
man1_files="" man1_files=""
man8_files=""
fi fi
AC_SUBST(man_dirs) AC_SUBST(man_dirs)
AC_SUBST(man1_files) AC_SUBST(man1_files)
AC_SUBST(man8_files)
# Shall we build the bench code? # Shall we build the bench code?
AC_ARG_WITH(bench, AC_ARG_WITH(bench,

3
man/Makefile.am
View File

@ -18,7 +18,8 @@
## Process this file with automake to create Makefile.in ## Process this file with automake to create Makefile.in
man1_MANS = @man1_files@ man1_MANS = @man1_files@
EXTRA_DIST = $(man1_MANS) man8_MANS = @man8_files@
EXTRA_DIST = $(man1_MANS) $(man8_MANS)
# Don't update the files from bitkeeper # Don't update the files from bitkeeper
%::SCCS/s.% %::SCCS/s.%

4
scripts/make_binary_distribution.sh
View File

@ -80,7 +80,7 @@ mkdir $BASE $BASE/bin $BASE/docs \
if [ $BASE_SYSTEM != "netware" ] ; then if [ $BASE_SYSTEM != "netware" ] ; then
mkdir $BASE/share/mysql $BASE/tests $BASE/sql-bench $BASE/man \ mkdir $BASE/share/mysql $BASE/tests $BASE/sql-bench $BASE/man \
$BASE/man/man1 $BASE/data $BASE/data/mysql $BASE/data/test $BASE/man/man1 $BASE/man/man8 $BASE/data $BASE/data/mysql $BASE/data/test
chmod o-rwx $BASE/data $BASE/data/* chmod o-rwx $BASE/data $BASE/data/*
fi fi
@ -203,6 +203,7 @@ if [ $BASE_SYSTEM != "netware" ] ; then
fi fi
if [ -d man ] ; then if [ -d man ] ; then
$CP man/*.1 $BASE/man/man1 $CP man/*.1 $BASE/man/man1
$CP man/*.8 $BASE/man/man8
fi fi
fi fi
@ -287,7 +288,6 @@ else
fi fi
# Make safe_mysqld a symlink to mysqld_safe for backwards portability # Make safe_mysqld a symlink to mysqld_safe for backwards portability
# To be removed in MySQL 4.1
(cd $BASE/bin ; ln -s mysqld_safe safe_mysqld ) (cd $BASE/bin ; ln -s mysqld_safe safe_mysqld )
# Clean up if we did this from a bk tree # Clean up if we did this from a bk tree

2
support-files/mysql.spec.sh
View File

@ -546,7 +546,7 @@ fi
%doc %attr(644, root, man) %{_mandir}/man1/myisamlog.1* %doc %attr(644, root, man) %{_mandir}/man1/myisamlog.1*
%doc %attr(644, root, man) %{_mandir}/man1/myisampack.1* %doc %attr(644, root, man) %{_mandir}/man1/myisampack.1*
%doc %attr(644, root, man) %{_mandir}/man1/mysql_explain_log.1* %doc %attr(644, root, man) %{_mandir}/man1/mysql_explain_log.1*
%doc %attr(644, root, man) %{_mandir}/man1/mysqld.1* %doc %attr(644, root, man) %{_mandir}/man8/mysqld.8*
%doc %attr(644, root, man) %{_mandir}/man1/mysqld_multi.1* %doc %attr(644, root, man) %{_mandir}/man1/mysqld_multi.1*
%doc %attr(644, root, man) %{_mandir}/man1/mysqld_safe.1* %doc %attr(644, root, man) %{_mandir}/man1/mysqld_safe.1*
%doc %attr(644, root, man) %{_mandir}/man1/mysql_fix_privilege_tables.1* %doc %attr(644, root, man) %{_mandir}/man1/mysql_fix_privilege_tables.1*