Changeset: d34cf63d1877 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d34cf63d1877
Modified Files:
        MonetDB/MonetDB.spec
        MonetDB4/MonetDB-server.spec
        MonetDB4/conf/MonetDB.conf.in
        MonetDB5/MonetDB-server.spec
        MonetDB5/conf/monetdb5.conf.in
        buildtools/conf/MonetDB.m4
        clients/MonetDB-client.spec
        geom/MonetDB-geom.spec
        pathfinder/MonetDB-XQuery.spec
        sql/MonetDB-SQL.spec
        sql/src/backends/monet5/merovingian/ChangeLog.Oct2010
        testing/MonetDB-testing.spec
Branch: default
Log Message:

Merge with Oct2010 branch.


diffs (truncated from 873 to 300 lines):

diff -r 3727151e7de9 -r d34cf63d1877 .hgtags
--- a/.hgtags   Fri Oct 29 10:30:02 2010 +0200
+++ b/.hgtags   Fri Oct 29 11:30:58 2010 +0200
@@ -425,3 +425,4 @@
 19ede2d368c6cba18d6b67cd8bde9d51af2ac9f8 Jun2010_5
 931928c216bc600a35580fa19f73daac66bd3571 Jun2010_5
 f0df8bc4610227ef4d0b54b21f978c0c3cb3f31f Oct2010_root
+ae12a56d3420aae3cf9928d4a7ddae30d3bf70be Oct2010_1
diff -r 3727151e7de9 -r d34cf63d1877 MonetDB/MonetDB.spec
--- a/MonetDB/MonetDB.spec      Fri Oct 29 10:30:02 2010 +0200
+++ b/MonetDB/MonetDB.spec      Fri Oct 29 11:30:58 2010 +0200
@@ -26,7 +26,7 @@
 Group: Applications/Databases
 License: MPL - http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html
 URL: http://monetdb.cwi.nl/
-Source: 
http://dev.monetdb.org/downloads/sources/Jun2010-SP2/%{name}-%{version}.tar.gz
+Source: 
http://dev.monetdb.org/downloads/sources/Oct2010/%{name}-%{version}.tar.gz
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires: zlib-devel, bzip2-devel, openssl-devel
@@ -110,6 +110,9 @@
 %{_libdir}/libbat.so
 
 %changelog
+* Fri Oct 29 2010 Sjoerd Mullender <sjo...@acm.org> - 1.40.1-20101029
+- Rebuilt.
+
 * Tue Aug 24 2010 Sjoerd Mullender <sjo...@acm.org> - 1.38.5-20100824
 - Rebuilt.
 
diff -r 3727151e7de9 -r d34cf63d1877 MonetDB/debian/changelog
--- a/MonetDB/debian/changelog  Fri Oct 29 10:30:02 2010 +0200
+++ b/MonetDB/debian/changelog  Fri Oct 29 11:30:58 2010 +0200
@@ -1,3 +1,9 @@
+monetdb (1.40.1-20101029) unstable; urgency=low
+
+  * Rebuilt.
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Fri, 29 Oct 2010 10:30:29 +0200
+
 monetdb (1.38.5-20100824) unstable; urgency=low
 
   * Rebuilt.
diff -r 3727151e7de9 -r d34cf63d1877 MonetDB4/MonetDB-server.spec
--- a/MonetDB4/MonetDB-server.spec      Fri Oct 29 10:30:02 2010 +0200
+++ b/MonetDB4/MonetDB-server.spec      Fri Oct 29 11:30:58 2010 +0200
@@ -26,7 +26,7 @@
 Group: Applications/Databases
 License:   MPL - http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html
 URL: http://monetdb.cwi.nl/
-Source: 
http://dev.monetdb.org/downloads/sources/Jun2010-SP2/MonetDB4-server-%{version}.tar.gz
+Source: 
http://dev.monetdb.org/downloads/sources/Oct2010/MonetDB4-server-%{version}.tar.gz
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 Requires(pre): shadow-utils
@@ -216,6 +216,9 @@
 %{_libdir}/libembeddedmil.so
 
 %changelog
+* Fri Oct 29 2010 Sjoerd Mullender <sjo...@acm.org> - 4.40.1-20101029
+- Rebuilt.
+
 * Tue Aug 24 2010 Sjoerd Mullender <sjo...@acm.org> - 4.38.5-20100824
 - Rebuilt.
 
diff -r 3727151e7de9 -r d34cf63d1877 MonetDB4/debian/changelog
--- a/MonetDB4/debian/changelog Fri Oct 29 10:30:02 2010 +0200
+++ b/MonetDB4/debian/changelog Fri Oct 29 11:30:58 2010 +0200
@@ -1,3 +1,9 @@
+monetdb4-server (4.40.1-20101029) unstable; urgency=low
+
+  * Rebuilt.
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Fri, 29 Oct 2010 10:30:29 +0200
+
 monetdb4-server (4.38.5-20100824) unstable; urgency=low
 
   * Rebuilt.
diff -r 3727151e7de9 -r d34cf63d1877 MonetDB5/ChangeLog-Archive
--- a/MonetDB5/ChangeLog-Archive        Fri Oct 29 10:30:02 2010 +0200
+++ b/MonetDB5/ChangeLog-Archive        Fri Oct 29 11:30:58 2010 +0200
@@ -1,6 +1,33 @@
 # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
 # This file contains past ChangeLog entries
 
+* Sat Jul 17 2010 m...@cwi.nl - 5.22.1-20101029
+- Debugging the optimizer pipeline The best way is to use 
mdb.traceOptimizer(str)
+  and inspect the information gathered during the optimization phase.
+  Several optimizers produce more intermediate information, which may
+  shed light on the details.  The optDebug bitvector controls their
+  output. It can be set to a pipeline or a comma separated list of
+  optimizers you would like to trace. It is a server wide property and
+  can not be set dynamically, as it is intended for internal use.
+
+* Wed Oct 27 2010 Fabian Groffen <fab...@cwi.nl> - 5.22.1-20101029
+- Resolved a problem with leaking threads, eventually causing new
+  connections to the server to hang, bug #2700
+
+* Tue Jul 13 2010 Stefan Manegold <stefan.maneg...@cwi.nl> - 5.22.1-20101029
+- Added "sequential_pipe" SQL optimizer pipeline that is (and should be kept!)
+  identical to the default pipeline, except that optimizers mitosis & dataflow
+  are omitted.
+
+* Mon Jul 12 2010 Stefan Manegold <stefan.maneg...@cwi.nl> - 5.22.1-20101029
+- Added "no_mitosis_pipe" SQL optimizer pipeline that is (and should be kept!)
+  identical to the default pipeline, except that optimizer mitosis is omitted.
+
+* Mon Aug 30 2010 Sjoerd Mullender <sjo...@acm.org> - 5.22.1-20101029
+- When attempting to insert incorrect UTF-8 sequences in a COPY INTO
+  statement, the error message was truncated.  This is now fixed.
+  Bug 2575.
+
 * Tue Aug 24 2010 Sjoerd Mullender <sjo...@acm.org> - 5.20.5-20100824
 - Fixed a crash when calculating certain aggregates on platforms where
   non-aligned data access is not allowed (e.g. Sparc).
diff -r 3727151e7de9 -r d34cf63d1877 MonetDB5/ChangeLog.Jun2010
--- a/MonetDB5/ChangeLog.Jun2010        Fri Oct 29 10:30:02 2010 +0200
+++ b/MonetDB5/ChangeLog.Jun2010        Fri Oct 29 11:30:58 2010 +0200
@@ -1,8 +1,3 @@
 # ChangeLog file for MonetDB5
 # This file is updated with Maddlog
 
-* Mon Aug 30 2010 Sjoerd Mullender <sjo...@acm.org>
-- When attempting to insert incorrect UTF-8 sequences in a COPY INTO
-  statement, the error message was truncated.  This is now fixed.
-  Bug 2575.
-
diff -r 3727151e7de9 -r d34cf63d1877 MonetDB5/ChangeLog.Oct2010
--- a/MonetDB5/ChangeLog.Oct2010        Fri Oct 29 10:30:02 2010 +0200
+++ b/MonetDB5/ChangeLog.Oct2010        Fri Oct 29 11:30:58 2010 +0200
@@ -1,25 +1,3 @@
 # ChangeLog file for MonetDB5
 # This file is updated with Maddlog
 
-* Sat Jul 17 2010 m...@cwi.nl
-- Debugging the optimizer pipeline The best way is to use 
mdb.traceOptimizer(str)
-  and inspect the information gathered during the optimization phase.
-  Several optimizers produce more intermediate information, which may
-  shed light on the details.  The optDebug bitvector controls their
-  output. It can be set to a pipeline or a comma separated list of
-  optimizers you would like to trace. It is a server wide property and
-  can not be set dynamically, as it is intended for internal use.
-
-* Wed Oct 27 2010 Fabian Groffen <fab...@cwi.nl>
-- Resolved a problem with leaking threads, eventually causing new
-  connections to the server to hang, bug #2700
-
-* Tue Jul 13 2010 Stefan Manegold <stefan.maneg...@cwi.nl>
-- Added "sequential_pipe" SQL optimizer pipeline that is (and should be kept!)
-  identical to the default pipeline, except that optimizers mitosis & dataflow
-  are omitted.
-
-* Mon Jul 12 2010 Stefan Manegold <stefan.maneg...@cwi.nl>
-- Added "no_mitosis_pipe" SQL optimizer pipeline that is (and should be kept!)
-  identical to the default pipeline, except that optimizer mitosis is omitted.
-
diff -r 3727151e7de9 -r d34cf63d1877 MonetDB5/MonetDB-server.spec
--- a/MonetDB5/MonetDB-server.spec      Fri Oct 29 10:30:02 2010 +0200
+++ b/MonetDB5/MonetDB-server.spec      Fri Oct 29 11:30:58 2010 +0200
@@ -26,7 +26,7 @@
 Group: Applications/Databases
 License:   MPL - http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html
 URL: http://monetdb.cwi.nl/
-Source: 
http://dev.monetdb.org/downloads/sources/Jun2010-SP2/MonetDB5-server-%{version}.tar.gz
+Source: 
http://dev.monetdb.org/downloads/sources/Oct2010/MonetDB5-server-%{version}.tar.gz
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 %{!?_with_raptor: %{!?_without_raptor: %define _with_raptor --with-raptor}}
@@ -216,6 +216,36 @@
 %{_libdir}/pkgconfig/monetdb-mal.pc
 
 %changelog
+* Fri Oct 29 2010 Sjoerd Mullender <sjo...@acm.org> - 5.22.1-20101029
+- Rebuilt.
+
+* Wed Oct 27 2010 Fabian Groffen <fab...@cwi.nl> - 5.22.1-20101029
+- Resolved a problem with leaking threads, eventually causing new
+  connections to the server to hang, bug #2700
+
+* Mon Aug 30 2010 Sjoerd Mullender <sjo...@acm.org> - 5.22.1-20101029
+- When attempting to insert incorrect UTF-8 sequences in a COPY INTO
+  statement, the error message was truncated.  This is now fixed.
+  Bug 2575.
+
+* Tue Aug 24 2010 m...@cwi.nl - 5.22.1-20101029
+- Debugging the optimizer pipeline The best way is to use 
mdb.traceOptimizer(str)
+  and inspect the information gathered during the optimization phase.
+  Several optimizers produce more intermediate information, which may
+  shed light on the details.  The optDebug bitvector controls their
+  output. It can be set to a pipeline or a comma separated list of
+  optimizers you would like to trace. It is a server wide property and
+  can not be set dynamically, as it is intended for internal use.
+
+* Tue Aug 24 2010 Stefan Manegold <stefan.maneg...@cwi.nl> - 5.22.1-20101029
+- Added "sequential_pipe" SQL optimizer pipeline that is (and should be kept!)
+  identical to the default pipeline, except that optimizers mitosis & dataflow
+  are omitted.
+
+* Tue Aug 24 2010 Stefan Manegold <stefan.maneg...@cwi.nl> - 5.22.1-20101029
+- Added "no_mitosis_pipe" SQL optimizer pipeline that is (and should be kept!)
+  identical to the default pipeline, except that optimizer mitosis is omitted.
+
 * Tue Aug 24 2010 Sjoerd Mullender <sjo...@acm.org> - 5.20.5-20100824
 - Rebuilt.
 
diff -r 3727151e7de9 -r d34cf63d1877 MonetDB5/debian/changelog
--- a/MonetDB5/debian/changelog Fri Oct 29 10:30:02 2010 +0200
+++ b/MonetDB5/debian/changelog Fri Oct 29 11:30:58 2010 +0200
@@ -1,3 +1,51 @@
+monetdb5-server (5.22.1-20101029) unstable; urgency=low
+
+  * Rebuilt.
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Fri, 29 Oct 2010 10:30:30 +0200
+
+monetdb5-server (5.22.1-20101029) unstable; urgency=low
+
+  * Resolved a problem with leaking threads, eventually causing new
+    connections to the server to hang, bug #2700
+
+ -- Fabian Groffen <fab...@cwi.nl>  Wed, 27 Oct 2010 10:30:29 +0200
+
+monetdb5-server (5.22.1-20101029) unstable; urgency=low
+
+  * When attempting to insert incorrect UTF-8 sequences in a COPY INTO
+    statement, the error message was truncated.  This is now fixed.
+    Bug 2575.
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Mon, 30 Aug 2010 10:30:29 +0200
+
+monetdb5-server (5.22.1-20101029) unstable; urgency=low
+
+  * Debugging the optimizer pipeline The best way is to use 
mdb.traceOptimizer(str)
+    and inspect the information gathered during the optimization phase.
+    Several optimizers produce more intermediate information, which may
+    shed light on the details.  The optDebug bitvector controls their
+    output. It can be set to a pipeline or a comma separated list of
+    optimizers you would like to trace. It is a server wide property and
+    can not be set dynamically, as it is intended for internal use.
+
+ -- m...@cwi.nl  Tue, 24 Aug 2010 10:30:29 +0200
+
+monetdb5-server (5.22.1-20101029) unstable; urgency=low
+
+  * Added "sequential_pipe" SQL optimizer pipeline that is (and should be 
kept!)
+    identical to the default pipeline, except that optimizers mitosis & 
dataflow
+    are omitted.
+
+ -- Stefan Manegold <stefan.maneg...@cwi.nl>  Tue, 24 Aug 2010 10:30:29 +0200
+
+monetdb5-server (5.22.1-20101029) unstable; urgency=low
+
+  * Added "no_mitosis_pipe" SQL optimizer pipeline that is (and should be 
kept!)
+    identical to the default pipeline, except that optimizer mitosis is 
omitted.
+
+ -- Stefan Manegold <stefan.maneg...@cwi.nl>  Tue, 24 Aug 2010 10:30:29 +0200
+
 monetdb5-server (5.20.5-20100824) unstable; urgency=low
 
   * Rebuilt.
diff -r 3727151e7de9 -r d34cf63d1877 clients/ChangeLog-Archive
--- a/clients/ChangeLog-Archive Fri Oct 29 10:30:02 2010 +0200
+++ b/clients/ChangeLog-Archive Fri Oct 29 11:30:58 2010 +0200
@@ -1,6 +1,54 @@
 # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
 # This file contains past ChangeLog entries
 
+* Thu Oct 28 2010 Fabian Groffen <fab...@cwi.nl> - 1.40.1-20101029
+- Fix crash when the server disconnects during \d query
+
+* Wed Oct 27 2010 Sjoerd Mullender <sjo...@acm.org> - 1.40.1-20101029
+- A manual page for the msqldump program was added.
+- Mclient now recognizes the file name "-" to refer to its standard
+  input.
+
+* Fri Oct  1 2010 Sjoerd Mullender <sjo...@acm.org> - 1.40.1-20101029
+- Save readline history as we go along.  This fixes bug 2632.
+
+* Tue Sep 14 2010 Sjoerd Mullender <sjo...@acm.org> - 1.40.1-20101029
+- The \d and \D commands now require a space if they are followed by a
+  table name.  This is to accomodate future expansion where \d and \D
+  could be immediately followed by another letter to indicate the type
+  of object of interest.
+- Implemented dumping of "external" functions.  This fixes bug 2546.
+
+* Thu Aug 26 2010 Fabian Groffen <fab...@cwi.nl> - 1.40.1-20101029
+- Empty resultsets now show a header in mclient using SQL mode.
+
+* Wed Aug 18 2010 Fabian Groffen <fab...@cwi.nl> - 1.40.1-20101029
+- Allow users to specify their own default formatter (using format=), or
+  their default formatting width (using width=) in their .monetdb file.
+  Setting the latter option is mostly useful when using the sql
+  formatter, such that truncation can be disabled by setting width=-1.
+- Rendering of mclient's tabular mode (when using SQL) has been changed
+  considerably to get improved output.  Most importantly it now omits
+  parts of field values or even full columns when the used terminal width
+  is insufficient to display the result.  To disable this behaviour,
+  simply set width to -1 (via -w option or \w in mclient), or chose
+  another rendering mode.
+
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

Reply via email to