Commit 48dc7241 authored by jonathan@chorlton.adsl.perkin.org.uk's avatar jonathan@chorlton.adsl.perkin.org.uk
Browse files

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.
parent f8b7669e

scripts/make_binary_distribution.sh

+1 −4
Original line number Diff line number Diff line
@@ -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 \