mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 20:42:30 +01:00
97907ee8d7
DROP DATABASE in mysqladmin asks for confirmation (again) Added examined_rows to slow query log SHOW CREATE for TEMPORARY table BitKeeper/deleted/.del-shw000001.result~8b20b03d8319b9a5: Delete: mysql-test/r/shw000001.result BitKeeper/deleted/.del-shw000001.test~770d96a2c1c65b20: Delete: mysql-test/t/shw000001.test Docs/manual.texi: Added information about InnoDB and TEMPORARY tables acinclude.m4: Portability fixes client/errmsg.c: merge with libmysqd/errmsg.c client/mysqladmin.c: DROP DATABASE asks for confirmation (again) client/mysqltest.c: Portability fixes configure.in: Portability fixes for SGI compiler on Ia64 extra/resolve_stack_dump.c: Portability fixes include/global.h: Portability fixes isam/_dbug.c: Portability fixes mysql-test/mysql-test-run.sh: Portability fixes mysql-test/r/show_check.result: New test for SHOW CREATE mysql-test/t/show_check.test: New test for SHOW CREATE scripts/make_binary_distribution.sh: Added missing files sql/filesort.cc: Added examined_rows to slow query log sql/log.cc: Added examined_rows to slow query log sql/mysql_priv.h: Added examined_rows to slow query log sql/mysqlbinlog.cc: Fixed core dump when using wrong option sql/mysqld.cc: Removed not used argument sql/sql_base.cc: Fixed name problem with SHOW CREATE for TEMPORARY table sql/sql_class.h: Added examined_rows to slow query log sql/sql_parse.cc: Added examined_rows to slow query log sql/sql_select.cc: Added examined_rows to slow query log sql/sql_select.h: Added examined_rows to slow query log sql/sql_show.cc: Fixed SHOW CREATE for TEMPORARY table sql/sql_table.cc: Added examined_rows to slow query log
200 lines
5.2 KiB
Bash
200 lines
5.2 KiB
Bash
#!/bin/sh
|
|
# The default path should be /usr/local
|
|
|
|
# Get some info from configure
|
|
# chmod +x ./scripts/setsomevars
|
|
|
|
machine=@MACHINE_TYPE@
|
|
system=@SYSTEM_TYPE@
|
|
version=@VERSION@
|
|
export machine system version
|
|
SOURCE=`pwd`
|
|
CP="cp -p"
|
|
|
|
# Debug option must come first
|
|
DEBUG=0
|
|
if test x$1 = x"--debug"
|
|
then
|
|
DEBUG=1
|
|
shift 1
|
|
fi
|
|
|
|
# Save temporary distribution here (must be full path)
|
|
TMP=/tmp
|
|
if test $# -gt 0
|
|
then
|
|
TMP=$1
|
|
shift 1
|
|
fi
|
|
|
|
# Get optional suffix for distribution
|
|
SUFFIX=""
|
|
if test $# -gt 0
|
|
then
|
|
SUFFIX=$1
|
|
shift 1
|
|
fi
|
|
|
|
|
|
#make
|
|
|
|
# This should really be integrated with automake and not duplicate the
|
|
# installation list.
|
|
|
|
BASE=$TMP/my_dist$SUFFIX
|
|
|
|
if [ -d $BASE ] ; then
|
|
rm -r -f $BASE
|
|
fi
|
|
|
|
mkdir $BASE $BASE/bin $BASE/data $BASE/data/mysql $BASE/data/test \
|
|
$BASE/include $BASE/lib $BASE/support-files $BASE/share $BASE/share/mysql \
|
|
$BASE/tests $BASE/scripts $BASE/sql-bench $BASE/mysql-test \
|
|
$BASE/mysql-test/t $BASE/mysql-test/r \
|
|
$BASE/mysql-test/include $BASE/mysql-test/std_data
|
|
|
|
chmod o-rwx $BASE/data $BASE/data/*
|
|
|
|
for i in sql/ChangeLog COPYING COPYING.LIB README Docs/INSTALL-BINARY \
|
|
Docs/manual.html Docs/manual.txt Docs/manual_toc.html
|
|
do
|
|
$CP $i $BASE
|
|
done
|
|
|
|
for i in extra/comp_err extra/replace extra/perror extra/resolveip \
|
|
extra/my_print_defaults extra/resolve_stack_dump \
|
|
isam/isamchk isam/pack_isam myisam/myisamchk \
|
|
myisam/myisampack sql/mysqld sql/mysqlbinlog \
|
|
client/mysql sql/mysqld client/mysqlshow client/mysqlcheck \
|
|
client/mysqladmin client/mysqldump client/mysqlimport client/mysqltest \
|
|
client/.libs/mysql client/.libs/mysqlshow client/.libs/mysqladmin \
|
|
client/.libs/mysqldump client/.libs/mysqlimport client/.libs/mysqltest
|
|
do
|
|
if [ -f $i ]
|
|
then
|
|
$CP $i $BASE/bin
|
|
fi
|
|
done
|
|
strip $BASE/bin/*
|
|
|
|
for i in sql/mysqld.sym.gz
|
|
do
|
|
if [ -f $i ]
|
|
then
|
|
$CP $i $BASE/bin
|
|
fi
|
|
done
|
|
|
|
for i in libmysql/.libs/libmysqlclient.a libmysql/.libs/libmysqlclient.so* libmysql/libmysqlclient.* libmysql_r/.libs/libmysqlclient_r.a libmysql_r/.libs/libmysqlclient_r.so* libmysql_r/libmysqlclient_r.* mysys/libmysys.a strings/libmystrings.a dbug/libdbug.a $BASE/lib
|
|
do
|
|
if [ -f $i ]
|
|
then
|
|
$CP $i $BASE/lib
|
|
fi
|
|
done
|
|
|
|
$CP config.h include/* $BASE/include
|
|
rm $BASE/include/Makefile*; rm $BASE/include/*.in
|
|
|
|
$CP tests/*.res tests/*.tst tests/*.pl $BASE/tests
|
|
$CP support-files/* $BASE/support-files
|
|
|
|
$CP -r sql/share/* $BASE/share/mysql
|
|
rm -f $BASE/share/mysql/Makefile* $BASE/share/mysql/*/*.OLD
|
|
|
|
$CP mysql-test/mysql-test-run mysql-test/install_test_db $BASE/mysql-test/
|
|
$CP mysql-test/README $BASE/mysql-test/README
|
|
$CP mysql-test/include/*.inc $BASE/mysql-test/include
|
|
$CP mysql-test/std_data/*.dat mysql-test/std_data/*.001 $BASE/mysql-test/std_data
|
|
$CP mysql-test/t/*.test mysql-test/t/*.opt mysql-test/t/*.sh $BASE/mysql-test/t
|
|
$CP mysql-test/r/*.result mysql-test/r/*.require $BASE/mysql-test/r
|
|
|
|
$CP scripts/* $BASE/bin
|
|
rm -f $BASE/bin/Makefile* $BASE/bin/*.in $BASE/bin/*.sh $BASE/bin/mysql_install_db $BASE/bin/make_binary_distribution $BASE/bin/setsomevars $BASE/support-files/Makefile* $BASE/support-files/*.sh
|
|
|
|
$BASE/bin/replace \@localstatedir\@ ./data \@bindir\@ ./bin \@scriptdir\@ ./bin \@libexecdir\@ ./bin \@sbindir\@ ./bin \@prefix\@ . \@HOSTNAME\@ @HOSTNAME@ < $SOURCE/scripts/mysql_install_db.sh > $BASE/scripts/mysql_install_db
|
|
$BASE/bin/replace \@prefix\@ /usr/local/mysql \@bindir\@ ./bin \@MYSQLD_USER\@ root \@localstatedir\@ /usr/local/mysql/data < $SOURCE/support-files/mysql.server.sh > $BASE/support-files/mysql.server
|
|
$BASE/bin/replace /my/gnu/bin/hostname /bin/hostname -- $BASE/bin/safe_mysqld
|
|
|
|
mv $BASE/support-files/binary-configure $BASE/configure
|
|
chmod a+x $BASE/bin/* $BASE/scripts/* $BASE/support-files/mysql-* $BASE/configure
|
|
$CP -r sql-bench/* $BASE/sql-bench
|
|
rm -f $BASE/sql-bench/*.sh $BASE/sql-bench/Makefile* $BASE/lib/*.la
|
|
|
|
# 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 -r -f
|
|
find $BASE/sql-bench -name SCCS -print | xargs rm -r -f
|
|
fi
|
|
|
|
# Change the distribution to a long descriptive name
|
|
NEW_NAME=mysql@MYSQL_SERVER_SUFFIX@-$version-$system-$machine$SUFFIX
|
|
BASE2=$TMP/$NEW_NAME
|
|
rm -r -f $BASE2
|
|
mv $BASE $BASE2
|
|
BASE=$BASE2
|
|
#
|
|
# If we are compiling with gcc, copy libgcc.a to the distribution as libmygcc.a
|
|
#
|
|
|
|
if test "@GXX@" = "yes"
|
|
then
|
|
cd $BASE/lib
|
|
gcclib=`@CC@ --print-libgcc-file`
|
|
if test $? -ne 0
|
|
then
|
|
print "Warning: Couldn't find libgcc.a!"
|
|
else
|
|
$CP $gcclib libmygcc.a
|
|
fi
|
|
cd $SOURCE
|
|
fi
|
|
|
|
#if we are debugging, do not do tar/gz
|
|
if [ x$DEBUG = x1 ] ; then
|
|
exit
|
|
fi
|
|
|
|
# This is needed to prefere gnu tar instead of tar because tar can't
|
|
# always handle long filenames
|
|
|
|
PATH_DIRS=`echo $PATH | sed -e 's/^:/. /' -e 's/:$/ ./' -e 's/::/ . /g' -e 's/:/ /g' `
|
|
which_1 ()
|
|
{
|
|
for cmd
|
|
do
|
|
for d in $PATH_DIRS
|
|
do
|
|
for file in $d/$cmd
|
|
do
|
|
if test -x $file -a ! -d $file
|
|
then
|
|
echo $file
|
|
exit 0
|
|
fi
|
|
done
|
|
done
|
|
done
|
|
exit 1
|
|
}
|
|
|
|
#
|
|
# Create the result tar file
|
|
#
|
|
|
|
tar=`which_1 gtar`
|
|
if test "$?" = "1" -o "$tar" = ""
|
|
then
|
|
tar=tar
|
|
fi
|
|
|
|
echo "Using $tar to create archive"
|
|
cd $TMP
|
|
$tar cvf $SOURCE/$NEW_NAME.tar $NEW_NAME
|
|
cd $SOURCE
|
|
echo "Compressing archive"
|
|
gzip -9 $NEW_NAME.tar
|
|
echo "Removing temporary directory"
|
|
rm -r -f $BASE
|
|
|
|
echo "$NEW_NAME.tar.gz created"
|