mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
Fixes for binary distribution in tar file
- mysql_install_db doesn't require --basedir option anymore - Fix that mysql_install_db mysqld_safe mysql_fix_privilege_tables has right paths for tar binary install - Move some files from share/mysql to where they have always been (1.0 - 5.0) - Move scripts used when installing MariaDB to the scripts directory (Added symlinks in old place for compatibility) - Move man files to 'man' (from 'share/man') - Ensure that all scripts are executable mysql_secure_installation.sh - Added support for --basedir flag - Don't assume that the mysql binary is in the path Other: - Fixed crash when one got kill signal during bootstrap Docs/INSTALL-BINARY: Change references from MySQL to MariaDB Docs/mysql.info: Change references from MySQL to MariaDB README: Removed duplicate row configure.in: Change references from MySQL to MariaDB libmysql/libmysql.c: Assume that if version string contains '-maria-' we are also using MariaDB scripts/make_binary_distribution.sh: Fix that mysql_install_db mysqld_safe mysql_fix_privilege_tables has right paths for tar binary install Remove some files that should not be part of a MariaDB binary install Move some files from share/mysql to where they have always been (1.0 - 5.0) Move man files to 'man' (from 'share/man') Move scripts used when installing MariaDB to the scripts directory (Added symlinks in old place for compatibility) Removed generation of 'netware/init_db.sql', as it was never used Remove old reference to bk tree scripts/mysql_secure_installation.sh: Added support for --basedir flag Don't assume that the mysql binary is in the path Use .my.cnf files Removed a lot of useless 'echo' rows sql/mysqld.cc: Fixed crash when one got kill signal during bootstrap storage/maria/Makefile.am: Don't add internal test files to binary distributions storage/myisam/Makefile.am: Don't add internal test files to binary distributions support-files/Makefile.am: Make scripts executable support-files/config.huge.ini.sh: Removed execution bit support-files/config.medium.ini.sh: Removed execution bit support-files/config.small.ini.sh: Removed execution bit support-files/mysql.server.sh: Ensure this works also mysqld is in the 'bin' directory
This commit is contained in:
@ -239,8 +239,8 @@ if [ x"$BASE_SYSTEM" != x"netware" ] ; then
|
||||
# ----------------------------------------------------------------------
|
||||
|
||||
cd scripts
|
||||
rm -f mysql_install_db
|
||||
@MAKE@ mysql_install_db \
|
||||
rm -f mysql_install_db mysqld_safe mysql_fix_privilege_tables
|
||||
@MAKE@ mysql_install_db mysqld_safe mysql_fix_privilege_tables \
|
||||
prefix=. \
|
||||
bindir=./bin \
|
||||
sbindir=./bin \
|
||||
@ -257,7 +257,7 @@ if [ x"$BASE_SYSTEM" != x"netware" ] ; then
|
||||
sbindir=./bin \
|
||||
scriptdir=./bin \
|
||||
libexecdir=./bin \
|
||||
pkgdatadir=@pkgdatadir@
|
||||
pkgdatadir=./share
|
||||
cd ..
|
||||
|
||||
# ----------------------------------------------------------------------
|
||||
@ -320,6 +320,33 @@ if [ x"$BASE_SYSTEM" != x"netware" ] ; then
|
||||
mkdir $DEST/data $DEST/data/mysql $DEST/data/test
|
||||
chmod o-rwx $DEST/data $DEST/data/mysql $DEST/data/test
|
||||
|
||||
# Remove not needed files
|
||||
rm $DEST/share/mysql/errmsg.txt
|
||||
|
||||
# Remove NDB files
|
||||
rm -f $DEST/share/mysql/ndb-config-2-node.ini \
|
||||
$DEST/share/mysql/config*
|
||||
|
||||
#
|
||||
# Move things to make them easier to find in tar installation
|
||||
#
|
||||
mv $DEST/libexec/* $DEST/bin
|
||||
mv $DEST/share/man $DEST
|
||||
mv $DEST/share/mysql/binary-configure $DEST/configure
|
||||
mv $DEST/share/mysql/*.sql $DEST/share
|
||||
mv $DEST/share/mysql/*.cnf $DEST/share/mysql/*.server $DEST/share/mysql/mysql-log-rotate $DEST/support-files
|
||||
rmdir $DEST/libexec
|
||||
|
||||
#
|
||||
# Move some scripts that are only run once to 'scripts' directory
|
||||
# but add symbolic links instead to old place for compatibility
|
||||
#
|
||||
for i in mysql_secure_installation mysql_fix_extensions mysql_fix_privilege_tables
|
||||
do
|
||||
mv $DEST/bin/$i $DEST/scripts
|
||||
ln -s "../scripts/$i" $DEST/bin/$i
|
||||
done
|
||||
|
||||
# ----------------------------------------------------------------------
|
||||
# Create the result tar file
|
||||
# ----------------------------------------------------------------------
|
||||
@ -496,12 +523,21 @@ rm -f $BASE/bin/Makefile* $BASE/bin/*.in $BASE/bin/*.sh \
|
||||
$BASE/bin/mysql_install_db $BASE/bin/make_binary_distribution \
|
||||
$BASE/bin/make_win_* \
|
||||
$BASE/bin/setsomevars $BASE/support-files/Makefile* \
|
||||
$BASE/support-files/*.sh
|
||||
$BASE/support-files/*.sh \
|
||||
$BASE/share/mysql/errmsg.txt
|
||||
|
||||
# Remove NDB files
|
||||
rm -f $BASE/share/ndb-config-2-node.ini \
|
||||
$BASE/share/mysql/config*
|
||||
|
||||
#
|
||||
# Copy system dependent files
|
||||
# Move things to make things easier to find in tar installation
|
||||
#
|
||||
./scripts/fill_help_tables < ./Docs/manual.texi >> ./netware/init_db.sql
|
||||
|
||||
mv $BASE/share/man $BASE
|
||||
mv $BASE/share/mysql/binary-configure $BASE/configure
|
||||
mv $BASE/share/mysql/*.sql $BASE/share
|
||||
mv $BASE/share/mysql/*.cnf $BASE/share/mysql/*.server $BASE/share/mysql/mysql-log-rotate $BASE/support-files
|
||||
|
||||
#
|
||||
# Remove system dependent files
|
||||
@ -515,12 +551,6 @@ rm -f $BASE/support-files/magic \
|
||||
$BASE/support-files/MySQL-shared-compat.spec \
|
||||
$BASE/INSTALL-BINARY
|
||||
|
||||
# Clean up if we did this from a bk tree
|
||||
if [ -d $BASE/sql-bench/SCCS ] ; then
|
||||
find $BASE/share -name SCCS -print | xargs rm -rf
|
||||
find $BASE/sql-bench -name SCCS -print | xargs rm -rf
|
||||
fi
|
||||
|
||||
BASE2=$TMP/$NEW_NAME
|
||||
rm -rf $BASE2
|
||||
mv $BASE $BASE2
|
||||
|
Reference in New Issue
Block a user