Changeset: 9269cbb34d01 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9269cbb34d01
Modified Files:
.hgtags
MonetDB.spec
sql/ChangeLog.Aug2011
Branch: Dec2011
Log Message:
Merge with Aug2011 branch.
diffs (108 lines):
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -459,3 +459,6 @@ 477cc2a87348df99b4eab237501d1113e5cb21d8
5ab2786b8f740c3e9fd1578605cec2bcd7725bc2 Aug2011_7
477cc2a87348df99b4eab237501d1113e5cb21d8 Aug2011_SP2_release
f022d32377c51b00599ecb014a72ea7ea2d6b8ba Aug2011_SP2_release
+f2b853837a589ebbf776b0a87019dec40dedf12b Aug2011_9
+f022d32377c51b00599ecb014a72ea7ea2d6b8ba Aug2011_SP2_release
+7d48b69446bd2b3c863f12988a0da09a1f1b1f39 Aug2011_SP2_release
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -625,6 +625,17 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libmonet
rm -fr $RPM_BUILD_ROOT
%changelog
+* Thu Nov 10 2011 Fabian Groffen <[email protected]> - 11.5.9-20111110
+- Rebuilt.
+
+* Sun Nov 6 2011 Fabian Groffen <[email protected]> - 11.5.9-20111110
+- merovingian: Fixed a bug where monetdbd's socket files from /tmp were
removed when
+ a second monetdbd was attempted to be started using the same port.
+
+* Wed Oct 26 2011 Fabian Groffen <[email protected]> - 11.5.9-20111110
+- sql: Added a fix for bug #2834, which caused weird (failing) behaviour
+ with PreparedStatements.
+
* Fri Oct 21 2011 Sjoerd Mullender <[email protected]> - 11.5.7-20111021
- Rebuilt.
diff --git a/debian/changelog b/debian/changelog
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,23 @@
+monetdb (11.5.9-20111110) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Fabian Groffen <[email protected]> Thu, 10 Nov 2011 11:25:24 +0100
+
+monetdb (11.5.9-20111110) unstable; urgency=low
+
+ * merovingian: Fixed a bug where monetdbd's socket files from /tmp were
removed when
+ a second monetdbd was attempted to be started using the same port.
+
+ -- Fabian Groffen <[email protected]> Sun, 6 Nov 2011 11:25:24 +0100
+
+monetdb (11.5.9-20111110) unstable; urgency=low
+
+ * sql: Added a fix for bug #2834, which caused weird (failing) behaviour
+ with PreparedStatements.
+
+ -- Fabian Groffen <[email protected]> Wed, 26 Oct 2011 11:25:24 +0100
+
monetdb (11.5.7-20111021) unstable; urgency=low
* Rebuilt.
diff --git a/sql/ChangeLog-Archive b/sql/ChangeLog-Archive
--- a/sql/ChangeLog-Archive
+++ b/sql/ChangeLog-Archive
@@ -1,6 +1,10 @@
# DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
# This file contains past ChangeLog entries
+* Wed Oct 26 2011 Fabian Groffen <[email protected]> - 11.5.9-20111110
+- Added a fix for bug #2834, which caused weird (failing) behaviour
+ with PreparedStatements.
+
* Wed Sep 21 2011 Sjoerd Mullender <[email protected]> - 11.5.3-20110925
- Fixed a bug when using default values for interval columns. Bug 2877.
diff --git a/sql/ChangeLog.Aug2011 b/sql/ChangeLog.Aug2011
--- a/sql/ChangeLog.Aug2011
+++ b/sql/ChangeLog.Aug2011
@@ -1,7 +1,3 @@
# ChangeLog file for sql
# This file is updated with Maddlog
-* Wed Oct 26 2011 Fabian Groffen <[email protected]>
-- Added a fix for bug #2834, which caused weird (failing) behaviour
- with PreparedStatements.
-
diff --git a/tools/merovingian/ChangeLog-Archive
b/tools/merovingian/ChangeLog-Archive
--- a/tools/merovingian/ChangeLog-Archive
+++ b/tools/merovingian/ChangeLog-Archive
@@ -1,6 +1,10 @@
# DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
# This file contains past ChangeLog entries
+* Sun Nov 6 2011 Fabian Groffen <[email protected]> - 11.5.9-20111110
+- Fixed a bug where monetdbd's socket files from /tmp were removed when
+ a second monetdbd was attempted to be started using the same port.
+
* Sun Oct 9 2011 Fabian Groffen <[email protected]> - 11.5.5-20111018
- Resolved problem where monetdbd would terminate abnormally when
databases named 'control', 'discovery' or 'merovingian' were stopped.
diff --git a/tools/merovingian/ChangeLog.Aug2011
b/tools/merovingian/ChangeLog.Aug2011
--- a/tools/merovingian/ChangeLog.Aug2011
+++ b/tools/merovingian/ChangeLog.Aug2011
@@ -1,7 +1,3 @@
# ChangeLog file for sql/src/backends/monet5/merovingian
# This file is updated with mchangelog
-* Sun Nov 6 2011 Fabian Groffen <[email protected]>
-- Fixed a bug where monetdbd's socket files from /tmp were removed when
- a second monetdbd was attempted to be started using the same port.
-
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
