mirror of
https://github.com/MariaDB/server.git
synced 2025-12-24 11:21:21 +03:00
fixed up mysql-test - will not push this yet, as more clean up/testing is to follow
BitKeeper/deleted/.del-README~b8e00a1b57b91f69: ***MISSING WEAVE*** BitKeeper/deleted/.del-README~2bddc2706d0834d0: ***MISSING WEAVE*** mysql-test/r/alt000001.result: mvdir mysql-test/r/ins000001.result: mvdir mysql-test/r/rpl000001.a.result: mvdir mysql-test/r/rpl000001.b.result: mvdir mysql-test/r/rpl000002.result: mvdir mysql-test/r/rpl000003.result: mvdir mysql-test/r/rpl000004.a.result: mvdir mysql-test/r/rpl000004.b.result: mvdir mysql-test/r/rpl000005.result: mvdir mysql-test/r/rpl000006.result: mvdir mysql-test/r/rpl000007.result: mvdir mysql-test/r/rpl000008.result: mvdir mysql-test/r/rpl000009.result: mvdir mysql-test/r/rpl000010.result: mvdir mysql-test/r/rpl000011.result: mvdir mysql-test/r/rpl000012.result: mvdir mysql-test/r/rpl000012.status.result: mvdir mysql-test/r/rpl000013.result: mvdir mysql-test/r/rpl000013.status.result: mvdir mysql-test/r/sel000001.result: mvdir mysql-test/r/sel000002.result: mvdir mysql-test/r/sel000003.result: mvdir mysql-test/r/sel000004.result: mvdir mysql-test/r/sel000005.result: mvdir mysql-test/r/sel000006.result: mvdir mysql-test/r/sel000007.result: mvdir mysql-test/r/sel000008.result: mvdir mysql-test/r/sel000009.result: mvdir mysql-test/r/sel000010.result: mvdir mysql-test/r/sel000011.result: mvdir mysql-test/r/sel000012.result: mvdir mysql-test/r/sel000013.result: mvdir mysql-test/r/sel000014.result: mvdir mysql-test/r/sel000015.result: mvdir mysql-test/r/sel000016.result: mvdir mysql-test/r/sel000017.result: mvdir mysql-test/r/sel000018.result: mvdir mysql-test/r/sel000019.result: mvdir mysql-test/r/sel000020.result: mvdir mysql-test/r/sel000021.result: mvdir mysql-test/r/sel000022.result: mvdir mysql-test/r/sel000023.result: mvdir mysql-test/r/sel000024.result: mvdir mysql-test/r/sel000025.result: mvdir mysql-test/r/sel000026.result: mvdir mysql-test/r/sel000027.result: mvdir mysql-test/r/sel000028.result: mvdir mysql-test/r/sel000029.result: mvdir mysql-test/r/sel000030.result: mvdir mysql-test/r/sel000100.result: mvdir mysql-test/r/shw000001.result: mvdir mysql-test/t/README: mvdir mysql-test/t/err000001.test: mvdir mysql-test/t/rpl000007-slave.opt: mvdir mysql-test/t/rpl000008-slave.opt: mvdir mysql-test/t/rpl000009-slave.opt: mvdir mysql-test/t/rpl000010-slave.opt: mvdir mysql-test/t/rpl000013-slave.opt: mvdir BitKeeper/deleted/.del-start-mysqld~9c8f21a7ab97793a: ***MISSING WEAVE*** BitKeeper/deleted/.del-stop-mysqld~89a1194045f05d1c: ***MISSING WEAVE*** BitKeeper/deleted/.del-translate-tests~3869c1fdf0a5ea1a: ***MISSING WEAVE*** BitKeeper/deleted/.del-README~108667adaeabe3f5: ***MISSING WEAVE*** BitKeeper/deleted/.del-README~c5aaceda4c2b1a8: ***MISSING WEAVE*** BitKeeper/deleted/.del-select-key.master~e6b83af25df0ce5: ***MISSING WEAVE*** mysql-test/std_data/words.dat: Rename: mysql-test/std_data/words -> mysql-test/std_data/words.dat BitKeeper/deleted/.del-simple-select.master~6f3eb98812926caf: ***MISSING WEAVE*** Makefile.am: add mysql-test to distribution configure.in: added mysql-test libmysql/Makefile.am: include hash.h libmysql/Makefile.shared: add hash to libmysqlclient mysql-test/Makefile.am: mysql-test is now in source dist also mysql-test/chew_on_this/select.res: ***MISSING WEAVE*** mysql-test/install_test_db: renamed file, moved to different directory, and fixed up to work on binary dist mysql-test/mysql-test-run: clean-up of test suite, make it work on binary dist mysql-test/t/alt000001.test: moved directory mysql-test/t/ins000001.test: moved directory mysql-test/t/rpl000001.test: moved dir mysql-test/t/rpl000002.test: moved dir mysql-test/t/rpl000003.test: moved dir mysql-test/t/rpl000004.test: moved dir mysql-test/t/rpl000005.test: moved dir mysql-test/t/rpl000006.test: moved dir mysql-test/t/rpl000007.test: moved dir mysql-test/t/rpl000008.test: moved dir mysql-test/t/rpl000009.test: moved dir mysql-test/t/rpl000010.test: moved dir mysql-test/t/rpl000011.test: moved dir mysql-test/t/rpl000012.test: moved dir mysql-test/t/rpl000013.test: moved dir mysql-test/t/sel000001.test: moved dir mysql-test/t/sel000002.test: moved dir BitKeeper/etc/ignore: Added libmysql_r/hash.c scripts/mysql-3.23.29-gamma-pc-linux-gnu-i686.tar.gz to the ignore list mysql-test/t/sel000003.test: moved dir mysql-test/t/sel000004.test: moved dir mysql-test/t/sel000005.test: moved dir mysql-test/t/sel000100.test: moved dir mysql-test/t/shw000001.test: moved dir scripts/make_binary_distribution.sh: fixes to include mysql-test added -debug option to exit after building temp dir before tar.gz removed a bunch of SCCS files
This commit is contained in:
@@ -12,21 +12,36 @@ SOURCE=`pwd`
|
||||
|
||||
# Save temporary distribution here (must be full path)
|
||||
TMP=/tmp
|
||||
if test $# -gt 0
|
||||
if test $# -gt 0 -a x$1 != x"-debug"
|
||||
then
|
||||
TMP=$1
|
||||
shift 1
|
||||
fi
|
||||
|
||||
if test x$1 = x"-debug"
|
||||
then
|
||||
DEBUG=1
|
||||
shift 1
|
||||
fi
|
||||
|
||||
|
||||
#make
|
||||
|
||||
# This should really be integrated with automake and not duplicate the
|
||||
# installation list.
|
||||
|
||||
BASE=$TMP/my_dist
|
||||
|
||||
if [ -d $BASE ] ; then
|
||||
rm -rf $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/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 \
|
||||
@@ -37,8 +52,9 @@ done
|
||||
|
||||
for i in extra/comp_err extra/replace extra/perror extra/resolveip \
|
||||
extra/my_print_defaults isam/isamchk isam/pack_isam myisam/myisamchk myisam/myisampack sql/mysqld sql/mysqlbinlog \
|
||||
client/mysql sql/mysqld client/mysqlshow client/mysqladmin client/mysqldump client/mysqlimport \
|
||||
client/.libs/mysql client/.libs/mysqlshow client/.libs/mysqladmin client/.libs/mysqldump client/.libs/mysqlimport
|
||||
client/mysql sql/mysqld client/mysqlshow 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
|
||||
cp -p $i $BASE/bin
|
||||
done
|
||||
@@ -49,7 +65,16 @@ rm $BASE/include/Makefile*; rm $BASE/include/*.in
|
||||
cp -p tests/*.res tests/*.tst tests/*.pl $BASE/tests
|
||||
cp -p support-files/* $BASE/support-files
|
||||
cp -p 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
|
||||
cp -r -p sql/share/* $BASE/share/mysql; rm -f $BASE/share/mysql/Makefile* $BASE/share/mysql/*/*.OLD $BASE/share/CVS $BASE/share/*/CVS
|
||||
cp -r -p sql/share/* $BASE/share/mysql
|
||||
rm -f $BASE/share/mysql/Makefile* $BASE/share/mysql/*/*.OLD
|
||||
rm -rf $BASE/share/SCCS $BASE/share/*/SCCS
|
||||
|
||||
cp -p mysql-test/mysql-test-run mysql-test/install_test_db $BASE/scripts
|
||||
cp -p mysql-test/README $BASE/README
|
||||
cp -p mysql-test/include/*.inc $BASE/mysql-test/include
|
||||
cp -p mysql-test/std_data/*.dat $BASE/mysql-test/std_data
|
||||
cp -p mysql-test/t/*.test mysql-test/t/*.opt $BASE/mysql-test/t
|
||||
cp -p mysql-test/r/*.result $BASE/mysql-test/r
|
||||
|
||||
cp -p 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
|
||||
@@ -62,6 +87,8 @@ mv $BASE/support-files/binary-configure $BASE/configure
|
||||
chmod a+x $BASE/bin/* $BASE/scripts/* $BASE/support-files/mysql-* $BASE/configure
|
||||
cp -r -p sql-bench/* $BASE/sql-bench
|
||||
rm -f $BASE/sql-bench/*.sh $BASE/sql-bench/Makefile* $BASE/lib/*.la
|
||||
rm -rf `find $BASE/sql-bench -name SCCS`
|
||||
rm -rf `find $BASE/share -name SCCS`
|
||||
|
||||
# Change the distribution to a long descreptive name
|
||||
NEW_NAME=mysql-$version-$system-$machine
|
||||
@@ -86,6 +113,11 @@ then
|
||||
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
|
||||
|
||||
|
||||
Reference in New Issue
Block a user