Changeset: 8d35cb7263cb for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8d35cb7263cb
Modified Files:
configure.ag
gdk/gdk_utils.c
testing/Mtest.py.in
Branch: Oct2014
Log Message:
merged
diffs (47 lines):
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -1203,6 +1203,8 @@ if test "x$have_perl" != xno; then
AC_MSG_ERROR([Must specify --with-perl-libdir
when cross compiling])
fi
PERL_LIBDIR=`"$PERL" -MConfig -e
'$x=$Config{installvendorarch}; $x =~ s|$Config{vendorprefix}/||; print $x;'
2>/dev/null`
+ # On Darwin this starts with a slash, remove it
+ PERL_LIBDIR="${PERL_LIBDIR#/}"
;;
no) ;;
*)
diff --git a/gdk/gdk_utils.c b/gdk/gdk_utils.c
--- a/gdk/gdk_utils.c
+++ b/gdk/gdk_utils.c
@@ -1042,7 +1042,6 @@ GDKinit(opt *set, int setlen)
MT_lock_init(&GDKthreadLock, "GDKthreadLock");
MT_lock_init(&GDKtmLock, "GDKtmLock");
#endif
- (void) ATOMIC_TAS(GDKstopped, GDKstoppedLock, "GDKinit");
for (i = 0; i <= BBP_BATMASK; i++) {
MT_lock_init(&GDKbatLock[i].swap, "GDKswapLock");
MT_lock_init(&GDKbatLock[i].hash, "GDKhashLock");
@@ -1339,10 +1338,6 @@ GDKlockHome(void)
GDKfatal("GDKlockHome: Could not truncate %s\n", GDKLOCK);
fflush(GDKlockFile);
GDKlog(GDKLOGON);
- /*
- * In shared mode, we allow more parties to join. Release the lock.
- */
- ATOMIC_CLEAR(GDKstopped, GDKstoppedLock, "");
}
static void
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -2592,8 +2592,8 @@ def LaunchIt(cmd, TestInput, TestOut, Te
t.start()
if TestInput:
- proc.stdin.write(TestInput)
try:
+ proc.stdin.write(TestInput)
proc.stdin.flush()
except IOError, (IOerrNo, IOerrStr):
Warn("Flushing input pipe in LaunchIt failed with #%d: '%s'." %
(IOerrNo, IOerrStr))
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
