Commit 04d60b38 authored by unknown's avatar unknown
Browse files

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

into  mysql.com:/Users/kent/mysql/bk/mysql-4.1


configure.in:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
support-files/mysql.spec.sh:
  SCCS merged
parents 35945019 d1fde0f7

configure.in

+4 −0
Original line number Diff line number Diff line
@@ -2380,12 +2380,16 @@ then 
  man_dirs="man"

  man1_files=`ls -1 $srcdir/man/*.1 | sed -e 's;^.*man/;;'`

  man1_files=`echo $man1_files`

  man8_files=`ls -8 $srcdir/man/*.8 | sed -e 's;^.*man/;;'`

  man8_files=`echo $man8_files`

else

  man_dirs=""

  man1_files=""

  man8_files=""

fi

AC_SUBST(man_dirs)

AC_SUBST(man1_files)

AC_SUBST(man8_files)



# Shall we build the bench code?

AC_ARG_WITH(bench,

man/Makefile.am

+2 −1
Original line number Diff line number Diff line
@@ -18,7 +18,8 @@ 
## Process this file with automake to create Makefile.in



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

%::SCCS/s.%

scripts/make_binary_distribution.sh

+2 −2
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ mkdir $BASE $BASE/bin $BASE/docs \ 


if [ $BASE_SYSTEM != "netware" ] ; then

 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/*

fi
@@ -203,6 +203,7 @@ if [ $BASE_SYSTEM != "netware" ] ; then 
  fi

  if [ -d man ] ; then

    $CP man/*.1 $BASE/man/man1

    $CP man/*.8 $BASE/man/man8

  fi

fi
@@ -287,7 +288,6 @@ else 
fi



# 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 )



# Clean up if we did this from a bk tree

support-files/mysql.spec.sh

+1 −1
Original line number Diff line number Diff line
@@ -546,7 +546,7 @@ fi 
%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/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_safe.1*

%doc %attr(644, root, man) %{_mandir}/man1/mysql_fix_privilege_tables.1*