summaryrefslogtreecommitdiff
path: root/Build-tools/Do-compile
diff options
context:
space:
mode:
authorunknown <monty@hundin.mysql.fi>2002-08-17 18:02:56 +0300
committerunknown <monty@hundin.mysql.fi>2002-08-17 18:02:56 +0300
commit36827564d3d8d6f18e13d79bebed75572c21f769 (patch)
treecb6c69dea958c68e0dfee4737f5b9a8f63b37aee /Build-tools/Do-compile
parentc9bda5bc7efdd888f4388f1ae9235091fcd5f03a (diff)
downloadmariadb-git-36827564d3d8d6f18e13d79bebed75572c21f769.tar.gz
Portability fixes for 4.0.3 build.
Don't update MyISAM index file on UPDATE if index is not changed Build-tools/Do-compile: Remove log files as early as possible Docs/manual.texi: Changelog BitKeeper/etc/ignore: Added myisam/test2.MYD myisam/test2.MYI to the ignore list include/my_semaphore.h: Portability fix for SCO and BSDI innobase/configure.in: Don't use inline with openbsd as this cases linker problems. myisam/mi_update.c: Don't update index file on UPDATE if index is not changed mysys/my_pthread.c: Portability fix for hpux sql/item_cmpfunc.cc: Don't convert bigint to bigint
Diffstat (limited to 'Build-tools/Do-compile')
-rwxr-xr-xBuild-tools/Do-compile32
1 files changed, 20 insertions, 12 deletions
diff --git a/Build-tools/Do-compile b/Build-tools/Do-compile
index 53a79017f1a..58bd2e49a38 100755
--- a/Build-tools/Do-compile
+++ b/Build-tools/Do-compile
@@ -75,6 +75,19 @@ $ENV{"PERL5LIB"}="$pwd/$host/perl5:$pwd/$host/perl5/site_perl";
$slave_port=$mysql_tcp_port+16;
$manager_port=$mysql_tcp_port+1;
+if ($opt_stage == 0)
+{
+ system("mkdir Logs") if (! -d "Logs");
+ system("mv $log ${log}-old") if (-f $log);
+ unlink($log);
+}
+
+open(LOG,">>$log") || abort("Can't open log file, error $?");
+select LOG;
+$|=1;
+select STDOUT;
+$|=1;
+
if (-x "$host/bin/mysqladmin")
{
log_system("$host/bin/mysqladmin --no-defaults -u root -S $mysql_unix_port -s shutdown");
@@ -97,17 +110,8 @@ if ($opt_stage == 0)
}
rm_all("$host/test");
system("mkdir $host/test") if (! -d "$host/test");
- system("mkdir Logs") if (! -d "Logs");
- system("mv $log ${log}-old") if (-f $log);
- unlink($log);
}
-open(LOG,">>$log") || abort("Can't open log file, error $?");
-select LOG;
-$|=1;
-select STDOUT;
-$|=1;
-
safe_cd($host);
if ($opt_stage == 0 && ! $opt_use_old_distribution)
{
@@ -553,13 +557,17 @@ sub rm_all
sub kill_all
{
my ($pattern) = @_;
- my ($USER,$BSD,$LINUX,$pscmd, $user, $pid);
+ my ($USER,$BSD,$LINUX, $pscmd, $user, $pid);
$user=$ENV{'USER'};
- $BSD = -f '/vmunix' || $ENV{"OS"} eq "SunOS4";
+ $BSD = -f '/vmunix' || $ENV{"OS"} eq "SunOS4" || $^O eq 'darwin';
$LINUX = $^O eq 'linux';
$pscmd = $BSD ? "/bin/ps -auxww" : $LINUX ? "/bin/ps axuw" : "/bin/ps -ef";
- open(PS, "$pscmd|") || die "can't run $pscmd: $!";
+ if (!open(PS, "$pscmd|"))
+ {
+ print "Warning: Can't run $pscmd: $!\n";
+ exit;
+ }
# Catch any errors with eval. A bad pattern, for instance.
process: