Changeset: 83c9358c3e11 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=83c9358c3e11
Modified Files:
.hgtags
MonetDB.spec
debian/changelog
gdk/ChangeLog-Archive
gdk/ChangeLog.Jul2012
Branch: default
Log Message:
Merge with Jul2012 branch.
diffs (76 lines):
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -489,3 +489,6 @@ 6cc0a74a5518ce234159fadebcc82976165a5200
40fa73a916e18ecc3becae96a1b424863fd1d927 Jul2012_3
6cc0a74a5518ce234159fadebcc82976165a5200 Jul2012_release
8189deaa7dd5956a9bd6d0579519b6872eea2925 Jul2012_release
+bccc66e2bdff8af6b7568a78ca47bdde894dcc55 Jul2012_5
+8189deaa7dd5956a9bd6d0579519b6872eea2925 Jul2012_release
+e89d2bbb01411ab72a2902d60b364427565d4a44 Jul2012_release
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -679,6 +679,14 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libmonet
rm -fr $RPM_BUILD_ROOT
%changelog
+* Tue Jul 10 2012 Fabian Groffen <[email protected]> - 11.11.5-20120710
+- Rebuilt.
+
+* Mon Jul 9 2012 Niels Nes <[email protected]> - 11.11.5-20120710
+- gdk: Fixed intermittent problem that joins and selects return incorrect
+ results and possibly inconsistent databases. The problems only occurred
+ after a series of queries and updates, therefore it was hard to reproduce.
+
* Mon Jul 09 2012 Fabian Groffen <[email protected]> - 11.11.3-20120709
- Rebuilt.
diff --git a/debian/changelog b/debian/changelog
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+monetdb (11.11.5-20120710) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Fabian Groffen <[email protected]> Tue, 10 Jul 2012 11:52:59 +0200
+
+monetdb (11.11.5-20120710) unstable; urgency=low
+
+ * gdk: Fixed intermittent problem that joins and selects return incorrect
+ results and possibly inconsistent databases. The problems only occurred
+ after a series of queries and updates, therefore it was hard to reproduce.
+
+ -- Niels Nes <[email protected]> Mon, 9 Jul 2012 11:52:58 +0200
+
monetdb (11.11.3-20120709) unstable; urgency=low
* Rebuilt.
diff --git a/gdk/ChangeLog-Archive b/gdk/ChangeLog-Archive
--- a/gdk/ChangeLog-Archive
+++ b/gdk/ChangeLog-Archive
@@ -1,6 +1,11 @@
# DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
# This file contains past ChangeLog entries
+* Mon Jul 9 2012 Niels Nes <[email protected]> - 11.11.5-20120710
+- Fixed intermittent problem that joins and selects return incorrect
+ results and possibly inconsistent databases. The problems only occurred
+ after a series of queries and updates, therefore it was hard to reproduce.
+
* Wed Apr 4 2012 Sjoerd Mullender <[email protected]> - 11.11.1-20120706
- The sorted property, which was used to maintain whether a column in
a BAT was sorted or reverse sorted, has been replaced by a pair of
diff --git a/gdk/ChangeLog.Jul2012 b/gdk/ChangeLog.Jul2012
--- a/gdk/ChangeLog.Jul2012
+++ b/gdk/ChangeLog.Jul2012
@@ -1,8 +1,3 @@
# ChangeLog file for MonetDB
# This file is updated with Maddlog
-* Mon Jul 9 2012 Niels Nes <[email protected]>
-- Fixed intermittent problem that joins and selects return incorrect
- results and possibly inconsistent databases. The problems only occurred
- after a series of queries and updates, therefore it was hard to reproduce.
-
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
