Changeset: bb2c13503bf4 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=bb2c13503bf4
Modified Files:
gdk/gdk_utils.mx
Branch: default
Log Message:
Merge with Apr2011 branch.
diffs (37 lines):
diff --git a/buildtools/autogen/autogen/am.py b/buildtools/autogen/autogen/am.py
--- a/buildtools/autogen/autogen/am.py
+++ b/buildtools/autogen/autogen/am.py
@@ -1014,7 +1014,8 @@
fd.write("\tmkdir -p $(DESTDIR)'%s'\n" % rd)
fd.write("\tgem install --local --install-dir $(DESTDIR)'%s' --force
--rdoc '%s'\n" % (rd, f[:-4]))
fd.write("uninstall-local-%s: %s\n" % (sf, f[:-4]))
- fd.write("\tgem uninstall --install-dir $(DESTDIR)'%s' '%s'\n" % (rd,
f[:-4]))
+ # remove "-0.1.gemspec" from end of `f'
+ fd.write("\tgem uninstall --install-dir $(DESTDIR)'%s' '%s'\n" % (rd,
f[:-12]))
am['BUILT_SOURCES'].append(f[:-4])
am['CLEAN'].append(f[:-4])
fd.write('else\n')
diff --git a/clients/ChangeLog.Apr2011 b/clients/ChangeLog.Apr2011
--- a/clients/ChangeLog.Apr2011
+++ b/clients/ChangeLog.Apr2011
@@ -2,7 +2,7 @@
# This file is updated with Maddlog
* Fri Jul 1 2011 Fabian Groffen <fab...@cwi.nl>
-- Fix mod.fcn filter when using multiple targets, bug #2827
+- Fix stethoscope's mod.fcn filter when using multiple targets, bug #2827
* Wed Jun 29 2011 Sjoerd Mullender <sjo...@acm.org>
- The separate Python distribution now uses the same version number as
diff --git a/gdk/gdk_utils.mx b/gdk/gdk_utils.mx
--- a/gdk/gdk_utils.mx
+++ b/gdk/gdk_utils.mx
@@ -1806,7 +1806,7 @@
if (GDKstopped == 0) {
GDKstopped = 1; /* shouldn't there be a lock here? */
#ifdef HAVE_POSIX_FADVISE
- if (!GDKembedded && GDK_vm_trim)
+ if (!GDKembedded && GDK_vm_trim && GDKvmtrim_id)
MT_join_thread(GDKvmtrim_id);
#endif
GDKnrofthreads = 0;
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
