diff options
Diffstat (limited to 'Build-tools')
| -rwxr-xr-x | Build-tools/Do-all-build-steps | 8 | ||||
| -rwxr-xr-x | Build-tools/Do-compile | 13 | ||||
| -rwxr-xr-x | Build-tools/Do-linux-build | 3 | ||||
| -rwxr-xr-x | Build-tools/Do-patch-file | 4 | ||||
| -rwxr-xr-x | Build-tools/Do-rpm | 25 |
5 files changed, 31 insertions, 22 deletions
diff --git a/Build-tools/Do-all-build-steps b/Build-tools/Do-all-build-steps index eb14b7105cd..8ff8851aecd 100755 --- a/Build-tools/Do-all-build-steps +++ b/Build-tools/Do-all-build-steps @@ -63,9 +63,13 @@ aclocal; autoheader; aclocal; automake; autoconf --with-low-memory \ --with-mit-threads=yes $EXTRA_CONFIG \ --enable-thread-safe-client \ - --with-berkeley-db \ --enable-local-infile \ - --with-innodb + --with-berkeley-db \ + --with-innodb \ + --with-vio \ + --without-pstack \ + --with-extra-tools \ + --with-embedded-server gmake -j 2 diff --git a/Build-tools/Do-compile b/Build-tools/Do-compile index 0a4776b3eb9..9f62b617056 100755 --- a/Build-tools/Do-compile +++ b/Build-tools/Do-compile @@ -215,14 +215,7 @@ if ($opt_stage <= 1) # Only enable InnoDB when requested (required to be able to # build the "Classic" packages that do not include InnoDB) - if ($opt_innodb) - { - $opt_config_options.= " --with-innodb"; - } - else - { - $opt_config_options.= " --without-innodb"; - } + $opt_config_options.= " --without-innodb" if (!$opt_innodb); if ($opt_with_other_libc) { @@ -300,7 +293,7 @@ if ($opt_stage <= 5 && !$opt_no_test) { system("mkdir $bench_tmpdir") if (! -d $bench_tmpdir); safe_cd("${test_dir}/mysql-test"); - check_system("./mysql-test-run --tmpdir=$bench_tmpdir --master_port=$mysql_tcp_port --slave_port=$slave_port --sleep=10", "tests were successful"); + check_system("./mysql-test-run --warnings --tmpdir=$bench_tmpdir --master_port=$mysql_tcp_port --slave_port=$slave_port --manager-port=$manager_port --no-manager --sleep=10", "tests were successful"); } # @@ -317,7 +310,7 @@ if (!$opt_no_test) $extra=""; if ($opt_bdb) { - $extra.=" -O bdb_cache_size=16M"; + $extra.=" --bdb_cache_size=16M --bdb_max_lock=60000" } if ($opt_innodb) { diff --git a/Build-tools/Do-linux-build b/Build-tools/Do-linux-build index 60cbf3426a8..44a9ad05fa2 100755 --- a/Build-tools/Do-linux-build +++ b/Build-tools/Do-linux-build @@ -3,7 +3,8 @@ set -e -x # Only use the "--with-other-libc" parameter, if another libc actually -# exists at this location +# exists, since this will also force static linking, which does not work +# together with OpenSSL OTHER_LIBC_DIR=/usr/local/mysql-glibc OTHER_LIBC="" if [ -d OTHER_LIBC_DIR ] ; then diff --git a/Build-tools/Do-patch-file b/Build-tools/Do-patch-file index 975c10c6b0e..7e6d4c493d8 100755 --- a/Build-tools/Do-patch-file +++ b/Build-tools/Do-patch-file @@ -13,8 +13,8 @@ NEW="mysql-$VER.tar.gz" OLD="mysql-$PVER.tar.gz" RESULT="mysql-$PVER-$VER.patch.gz" PATCH_DIR=/my/web/Downloads-live/Patches -RESULT_DIR=/my/web/Downloads-live/MySQL-3.23 -RESULT_DIR_MAX=/my/web/Downloads-live/MySQL-Max-3.23 +RESULT_DIR=/my/web/Downloads-live/MySQL-4.0 +RESULT_DIR_MAX=/my/web/Downloads-live/MySQL-Max-4.0 if test ! -f $NEWDIR/$NEW then diff --git a/Build-tools/Do-rpm b/Build-tools/Do-rpm index e80cb3f2028..6d107bc2413 100755 --- a/Build-tools/Do-rpm +++ b/Build-tools/Do-rpm @@ -5,6 +5,7 @@ function copy_to_bmachine { if [ x$local_build = x1 ]; then + rm -f $2 cp $1 $2 else scp $1 $owner@$bmachine:$2 @@ -14,6 +15,7 @@ function copy_to_bmachine function copy_from_bmachine { if [ x$local_build = x1 ]; then + rm -f $2 cp $1 $2 else scp $owner@$bmachine:$1 $2 @@ -104,10 +106,7 @@ while test $# -gt 0; do done echo "Removing old MySQL packages" -rm -rf $rpmdir/BUILD/mysql-* -rm -f $rpmdir/SOURCES/mysql-* -rm -f $rpmdir/SRPMS/MySQL-* -rm -f $rpmdir/SPEC/mysql-* +rm -f $bpath/NEW-RPMS/MySQL-*rpm if [ ! -d "$logdir" ]; then echo "$logdir does not exist, creating" @@ -119,12 +118,20 @@ if [ ! -f "$tarball" ]; then exit 1 fi -echo "Building RPM for MySQL version $VER on $bmachine" - log=$logdir/Log-RPM-`date +%y%m%d-%H%M` +echo "Building RPM for MySQL version $VER on $bmachine" +echo "Details in $log" + ( set -x +# remove old stuff +rm -rf $rpmdir/BUILD/mysql-* +rm -f $rpmdir/SOURCES/mysql-* +rm -f $rpmdir/SRPMS/MySQL-* +rm -f $rpmdir/SPECS/mysql-* +rm -rf /var/tmp/mysql + # Copy MySQL source and spec files #Sasha: I left the scp stuff commented out instead of deleted to make it @@ -174,7 +181,7 @@ if [ ! x$skip_perl=x1 ]; then set -x # First clean up so we do not get old versions when wildcard matching - rm -f $rpmdir/SOURCES/DBI-*.spec + rm -f $rpmdir/SOURCES/DBI-*.spec $rpmdir/SOURCES/mysql* rm -f $rpmdir/RPMS/i386/Perl-*.rpm rm -f $rpmdir/SRPMS/Perl-*.rpm rm -f $rpmdir/RPMS/i386/MySQL*-$VER_NO_DASH*.rpm @@ -244,5 +251,9 @@ if [ x$local_build != x1 ]; then # And the perl ones #scp $owner@$bmachine:$rpmdir/RPMS/i386/Perl*-*.rpm $bpath/NEW-RPMS #scp $owner@$bmachine:$rpmdir/SRPMS/Perl*-*.rpm $bpath/NEW-RPMS + + #Remove some of the files that can interfere with future builds + + rm -rf /var/tmp/mysql fi ) > $log 2>&1 |