From: Date: July 5 2007 1:51pm Subject: bk commit into 5.0 tree (jonathan:1.2504) BUG#28585 List-Archive: http://lists.mysql.com/commits/30367 X-Bug: 28585 Message-Id: <20070705115155.DA31A16B6FF@chorlton.adsl.perkin.org.uk> Below is the list of changes that have just been committed into a local 5.0 repository of jonathan. When jonathan does a push these changes will be propagated to the main repository and, within 24 hours after the push, to the public repository. For information on how to access the public repository see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html ChangeSet@stripped, 2007-07-05 12:51:51+01:00, jonathan@stripped +1 -0 make_binary_distribution.sh: This script incorrectly generates the mysql_install_db file, causing the problems detailed in bug#28585. The automake infrastructure correctly generates the script, so just copy it in place. scripts/make_binary_distribution.sh@stripped, 2007-07-05 12:50:14+01:00, jonathan@stripped +1 -4 This script incorrectly generates the mysql_install_db file, causing the problems detailed in bug#28585. The automake infrastructure correctly generates the script, so just copy it in place. diff -Nrup a/scripts/make_binary_distribution.sh b/scripts/make_binary_distribution.sh --- a/scripts/make_binary_distribution.sh 2007-05-22 16:06:44 +01:00 +++ b/scripts/make_binary_distribution.sh 2007-07-05 12:50:14 +01:00 @@ -314,10 +314,7 @@ fi if [ $BASE_SYSTEM != "netware" ] ; then chmod a+x $BASE/bin/* copyfileto $BASE/bin scripts/* - $BASE/bin/replace \@localstatedir\@ ./data \@bindir\@ ./bin \@scriptdir\@ \ - ./bin \@libexecdir\@ ./bin \@sbindir\@ ./bin \@prefix\@ . \@HOSTNAME\@ \ - @HOSTNAME@ \@pkgdatadir\@ ./support-files \ - < scripts/mysql_install_db.sh > $BASE/scripts/mysql_install_db + copyfileto $BASE/scripts scripts/mysql_install_db $BASE/bin/replace \@prefix\@ /usr/local/mysql \@bindir\@ ./bin \ \@sbindir\@ ./bin \@libexecdir\@ ./bin \ \@MYSQLD_USER\@ @MYSQLD_USER@ \@localstatedir\@ /usr/local/mysql/data \