mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 20:42:30 +01:00
mysql-test-run.pl:
Removed -c from /bin/sh call make_win_src_distribution.sh: Copy all content in mysql-test make_win_binary_distribution.sh, make_binary_distribution.sh: Add Perl version of mysql-test-run to package s_win32_dsp, s_win32, s_vxworks, s_test, s_readme, s_java, s_javah: Bug #6209 changes for building Berkeley DB from BitKeeper on Solaris
This commit is contained in:
kent@mysql.com
parent
fa001505e3
commit
c6002966be
11 changed files with 35 additions and 17 deletions
2
bdb/dist/s_java
vendored
2
bdb/dist/s_java
vendored
|
|
@ -5,7 +5,7 @@
|
|||
|
||||
msgjava="/* DO NOT EDIT: automatically built by dist/s_java. */"
|
||||
|
||||
. RELEASE
|
||||
. ./RELEASE
|
||||
|
||||
t=/tmp/__java
|
||||
c=/tmp/__javajnic
|
||||
|
|
|
|||
2
bdb/dist/s_javah
vendored
2
bdb/dist/s_javah
vendored
|
|
@ -8,7 +8,7 @@
|
|||
# Using Sun's JDK rather than some other installation ensures
|
||||
# that the header files will not be constantly changed.
|
||||
|
||||
. RELEASE
|
||||
. ./RELEASE
|
||||
|
||||
JAVAC=javac
|
||||
JAVAH=javah
|
||||
|
|
|
|||
2
bdb/dist/s_readme
vendored
2
bdb/dist/s_readme
vendored
|
|
@ -8,7 +8,7 @@ d=..
|
|||
t=/tmp/__t
|
||||
trap 'rm -f $t; exit 0' 0 1 2 3 13 15
|
||||
|
||||
. RELEASE
|
||||
. ./RELEASE
|
||||
|
||||
cat << END_OF_README>$t
|
||||
$DB_VERSION_STRING
|
||||
|
|
|
|||
2
bdb/dist/s_test
vendored
2
bdb/dist/s_test
vendored
|
|
@ -9,7 +9,7 @@ msg2="# Automatically built by dist/s_test; may require local editing."
|
|||
t=/tmp/__t
|
||||
trap 'rm -f $t; exit 0' 0 1 2 3 13 15
|
||||
|
||||
. RELEASE
|
||||
. ./RELEASE
|
||||
|
||||
(echo "$msg1" && \
|
||||
echo "" && \
|
||||
|
|
|
|||
2
bdb/dist/s_vxworks
vendored
2
bdb/dist/s_vxworks
vendored
|
|
@ -5,7 +5,7 @@
|
|||
|
||||
msgc="/* DO NOT EDIT: automatically built by dist/s_vxworks. */"
|
||||
|
||||
. RELEASE
|
||||
. ./RELEASE
|
||||
|
||||
s=/tmp/__db_a
|
||||
t=/tmp/__db_b
|
||||
|
|
|
|||
2
bdb/dist/s_win32
vendored
2
bdb/dist/s_win32
vendored
|
|
@ -6,7 +6,7 @@
|
|||
msgc="/* DO NOT EDIT: automatically built by dist/s_win32. */"
|
||||
msgw="; DO NOT EDIT: automatically built by dist/s_win32."
|
||||
|
||||
. RELEASE
|
||||
. ./RELEASE
|
||||
|
||||
s=/tmp/__db_a$$
|
||||
t=/tmp/__db_b$$
|
||||
|
|
|
|||
6
bdb/dist/s_win32_dsp
vendored
6
bdb/dist/s_win32_dsp
vendored
|
|
@ -3,7 +3,7 @@
|
|||
#
|
||||
# Build Windows/32 .dsp files.
|
||||
|
||||
. RELEASE
|
||||
. ./RELEASE
|
||||
|
||||
BUILDDIR=../build_win32
|
||||
SRCFILES=srcfiles.in
|
||||
|
|
@ -35,7 +35,9 @@ create_dsp()
|
|||
-e "s/@srcfile@/$srcfile/g" \
|
||||
< $srctemplate >> $dspoutput.insert
|
||||
done
|
||||
sed -e "/@SOURCE_FILES@/r$dspoutput.insert" \
|
||||
# We need exactly one space after the 'r' modifier
|
||||
# See 5.9 in http://www.student.northpark.edu/pemente/sed/sedfaq.txt
|
||||
sed -e "/@SOURCE_FILES@/r $dspoutput.insert" \
|
||||
-e "/@SOURCE_FILES@/d" \
|
||||
-e "s/@project_name@/$projname/g" \
|
||||
-e "s/@DB_VERSION_MAJOR@/$DB_VERSION_MAJOR/g" \
|
||||
|
|
|
|||
|
|
@ -1535,6 +1535,7 @@ sub do_before_start_master ($$) {
|
|||
$tname ne "rpl_crash_binlog_ib_3b")
|
||||
{
|
||||
# FIXME we really want separate dir for binlogs
|
||||
# FIXME replace 'rm' in backticks with portable Perl function
|
||||
`rm -f $glob_mysql_test_dir/var/log/master-bin*`;
|
||||
# unlink("$glob_mysql_test_dir/var/log/master-bin*");
|
||||
}
|
||||
|
|
@ -1548,8 +1549,12 @@ sub do_before_start_master ($$) {
|
|||
# Run master initialization shell script if one exists
|
||||
if ( $init_script )
|
||||
{
|
||||
# We ignore the return code
|
||||
mtr_run("/bin/sh", ["-c",$init_script], "", "", "", "");
|
||||
my $ret= mtr_run("/bin/sh", [$init_script], "", "", "", "");
|
||||
if ( $ret != 0 )
|
||||
{
|
||||
# FIXME rewrite those scripts to return 0 if successful
|
||||
# mtr_warning("$init_script exited with code $ret");
|
||||
}
|
||||
}
|
||||
# for gcov FIXME needed? If so we need more absolute paths
|
||||
# chdir($glob_basedir);
|
||||
|
|
@ -1566,6 +1571,7 @@ sub do_before_start_slave ($$) {
|
|||
$tname ne "rpl_crash_binlog_ib_3b" )
|
||||
{
|
||||
# FIXME we really want separate dir for binlogs
|
||||
# FIXME replace 'rm' in backticks with portable Perl function
|
||||
`rm -fr $glob_mysql_test_dir/var/log/slave*-bin.*`;
|
||||
# unlink("$glob_mysql_test_dir/var/log/slave*-bin.*"); # FIXME idx???
|
||||
# FIXME really master?!
|
||||
|
|
@ -1576,8 +1582,12 @@ sub do_before_start_slave ($$) {
|
|||
# Run slave initialization shell script if one exists
|
||||
if ( $init_script )
|
||||
{
|
||||
# We ignore the return code
|
||||
mtr_run("/bin/sh", ["-c",$init_script], "", "", "", "");
|
||||
my $ret= mtr_run("/bin/sh", [$init_script], "", "", "", "");
|
||||
if ( $ret != 0 )
|
||||
{
|
||||
# FIXME rewrite those scripts to return 0 if successful
|
||||
# mtr_warning("$init_script exited with code $ret");
|
||||
}
|
||||
}
|
||||
|
||||
`rm -f $glob_mysql_test_dir/var/slave-data/log.*`;
|
||||
|
|
|
|||
|
|
@ -66,7 +66,7 @@ esac
|
|||
mkdir $BASE $BASE/bin $BASE/docs \
|
||||
$BASE/include $BASE/lib $BASE/support-files $BASE/share $BASE/scripts \
|
||||
$BASE/mysql-test $BASE/mysql-test/t $BASE/mysql-test/r \
|
||||
$BASE/mysql-test/include $BASE/mysql-test/std_data
|
||||
$BASE/mysql-test/include $BASE/mysql-test/std_data $BASE/mysql-test/lib
|
||||
|
||||
if [ $BASE_SYSTEM != "netware" ] ; then
|
||||
mkdir $BASE/share/mysql $BASE/tests $BASE/sql-bench $BASE/man \
|
||||
|
|
@ -207,7 +207,7 @@ $CP -r sql/share/* $MYSQL_SHARE
|
|||
rm -f $MYSQL_SHARE/Makefile* $MYSQL_SHARE/*/*.OLD
|
||||
|
||||
for i in mysql-test/mysql-test-run mysql-test/install_test_db \
|
||||
mysql-test/README \
|
||||
mysql-test/mysql-test-run.pl mysql-test/README \
|
||||
netware/mysql_test_run.nlm netware/install_test_db.ncf
|
||||
do
|
||||
if [ -f $i ]
|
||||
|
|
@ -216,6 +216,8 @@ do
|
|||
fi
|
||||
done
|
||||
|
||||
$CP mysql-test/lib/*.pl $BASE/mysql-test/lib
|
||||
$CP mysql-test/lib/*.sql $BASE/mysql-test/lib
|
||||
$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/std_data/des_key_file $BASE/mysql-test/std_data
|
||||
|
|
@ -242,7 +244,7 @@ rm -f $BASE/bin/Makefile* $BASE/bin/*.in $BASE/bin/*.sh $BASE/bin/mysql_install_
|
|||
# Copy system dependent files
|
||||
#
|
||||
if [ $BASE_SYSTEM = "netware" ] ; then
|
||||
echo "CREATE DATABASE mysql;" > $BASE/bin/init_db.sql
|
||||
echo "CREATE DATABASE mysql;" > $BASE/bin/init_db.sql
|
||||
echo "CREATE DATABASE test;" >> $BASE/bin/init_db.sql
|
||||
sh ./scripts/mysql_create_system_tables.sh real "" "%" 0 >> $BASE/bin/init_db.sql
|
||||
sh ./scripts/mysql_create_system_tables.sh test "" "%" 0 > $BASE/bin/test_db.sql
|
||||
|
|
|
|||
|
|
@ -110,6 +110,10 @@ print_debug "Copying sql-bench to $DIRNAME/bench"
|
|||
mkdir $DIRNAME/bench
|
||||
cp -fr sql-bench/* $DIRNAME/bench
|
||||
|
||||
print_debug "Copying mysql-test to $DIRNAME/mysql-test"
|
||||
mkdir $DIRNAME/mysql-test
|
||||
cp -fr mysql-test/* $DIRNAME/mysql-test
|
||||
|
||||
print_debug "Copying support-files to $DIRNAME"
|
||||
cp support-files/* $DIRNAME
|
||||
|
||||
|
|
|
|||
|
|
@ -255,7 +255,7 @@ make -C $SOURCE/ndb windoze
|
|||
# Input directories to be copied recursively
|
||||
#
|
||||
|
||||
for i in bdb innobase mysql-test ndb
|
||||
for i in bdb innobase ndb
|
||||
do
|
||||
copy_dir_dirs $i
|
||||
done
|
||||
|
|
@ -305,7 +305,7 @@ done
|
|||
# Raw dirs from source tree
|
||||
#
|
||||
|
||||
for i in scripts sql-bench SSL tests
|
||||
for i in scripts sql-bench mysql-test SSL tests
|
||||
do
|
||||
print_debug "Copying directory '$i'"
|
||||
if [ -d $i ]
|
||||
|
|
|
|||
Loading…
Reference in a new issue