Changeset: 44f144d7eeb4 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=44f144d7eeb4
Modified Files:
        clients/MonetDB-client.spec
        sql/MonetDB-SQL.spec
Branch: default
Log Message:

Merge with Oct2010 branch.


diffs (truncated from 972 to 300 lines):

diff -r 9f649a98fbf2 -r 44f144d7eeb4 clients/MonetDB-client.spec
--- a/clients/MonetDB-client.spec       Wed Nov 10 20:47:51 2010 +0100
+++ b/clients/MonetDB-client.spec       Thu Nov 11 14:35:09 2010 +0100
@@ -316,7 +316,7 @@
 - Rebuilt.
 
 * Thu Oct 28 2010 Fabian Groffen <fab...@cwi.nl> - 1.40.1-20101029
-- Fix crash when the server disconnects during d query
+- 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.
@@ -327,8 +327,8 @@
 - 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
+- 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.
@@ -349,7 +349,7 @@
   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
+  simply set width to -1 (via -w option or \w in mclient), or chose
   another rendering mode.
 
 * Tue Aug 24 2010 Fabian Groffen <fab...@cwi.nl> - 1.40.1-20101029
diff -r 9f649a98fbf2 -r 44f144d7eeb4 clients/debian/changelog
--- a/clients/debian/changelog  Wed Nov 10 20:47:51 2010 +0100
+++ b/clients/debian/changelog  Thu Nov 11 14:35:09 2010 +0100
@@ -24,7 +24,7 @@
 
 monetdb-client (1.40.1-20101029) unstable; urgency=low
 
-  * Fix crash when the server disconnects during d query
+  * Fix crash when the server disconnects during \d query
 
  -- Fabian Groffen <fab...@cwi.nl>  Thu, 28 Oct 2010 10:30:30 +0200
 
@@ -44,8 +44,8 @@
 
 monetdb-client (1.40.1-20101029) unstable; urgency=low
 
-  * 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
+  * 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.
@@ -75,7 +75,7 @@
     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
+    simply set width to -1 (via -w option or \w in mclient), or chose
     another rendering mode.
 
  -- Fabian Groffen <fab...@cwi.nl>  Tue, 24 Aug 2010 10:30:30 +0200
diff -r 9f649a98fbf2 -r 44f144d7eeb4 sql/ChangeLog-Archive
--- a/sql/ChangeLog-Archive     Wed Nov 10 20:47:51 2010 +0100
+++ b/sql/ChangeLog-Archive     Thu Nov 11 14:35:09 2010 +0100
@@ -1,21 +1,21 @@
 # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
 # This file contains past ChangeLog entries
 
-* Mon Oct 18 2010 Sjoerd Mullender <sjo...@acm.org> - 2.40.0-20101029
+* Mon Oct 18 2010 Sjoerd Mullender <sjo...@acm.org> - 2.40.1-20101029
 - Fixed bug 2695: crash when starting mserver in readonly mode on a
   new database.
 
-* Wed Sep 22 2010 Fabian Groffen <fab...@cwi.nl> - 2.40.0-20101029
+* Wed Sep 22 2010 Fabian Groffen <fab...@cwi.nl> - 2.40.1-20101029
 - Improved uuid detection, to solve problems like bug #2675
 
-* Wed Jun 23 2010 Niels Nes <ni...@cwi.nl> - 2.40.0-20101029
+* Wed Jun 23 2010 Niels Nes <ni...@cwi.nl> - 2.40.1-20101029
 - make it possible to use '?' in offset and limit
 
-* Fri Sep 17 2010 Sjoerd Mullender <sjo...@acm.org> - 2.40.0-20101029
+* Fri Sep 17 2010 Sjoerd Mullender <sjo...@acm.org> - 2.40.1-20101029
 - Fixed a bug where the server silently ignored the last record in a
   COPY INTO if it was incomplete (e.g. missing a quote).
 
-* Mon Aug 30 2010 Sjoerd Mullender <sjo...@acm.org> - 2.40.0-20101029
+* Mon Aug 30 2010 Sjoerd Mullender <sjo...@acm.org> - 2.40.1-20101029
 - Fixed a crash of the server when an extremely complex query is
   attempted.  This is the latest incarnation of bug 104.
 
diff -r 9f649a98fbf2 -r 44f144d7eeb4 sql/MonetDB-SQL.spec
--- a/sql/MonetDB-SQL.spec      Wed Nov 10 20:47:51 2010 +0100
+++ b/sql/MonetDB-SQL.spec      Thu Nov 11 14:35:09 2010 +0100
@@ -168,32 +168,32 @@
 * Fri Nov 05 2010 Sjoerd Mullender <sjo...@acm.org> - 2.40.1-20101105
 - Rebuilt.
 
-* Fri Oct 29 2010 Sjoerd Mullender <sjo...@acm.org> - 2.40.0-20101029
+* Fri Oct 29 2010 Sjoerd Mullender <sjo...@acm.org> - 2.40.1-20101029
 - Rebuilt.
 
-* Thu Oct 21 2010 Fabian Groffen <fab...@cwi.nl> - 2.40.0-20101029
+* Thu Oct 21 2010 Fabian Groffen <fab...@cwi.nl> - 2.40.1-20101029
 - Report a stopped and locked database as under maintenance, instead of
   without connections, bug #2685
 
-* Mon Oct 18 2010 Sjoerd Mullender <sjo...@acm.org> - 2.40.0-20101029
+* Mon Oct 18 2010 Sjoerd Mullender <sjo...@acm.org> - 2.40.1-20101029
 - Fixed bug 2695: crash when starting mserver in readonly mode on a
   new database.
 
-* Wed Sep 22 2010 Fabian Groffen <fab...@cwi.nl> - 2.40.0-20101029
+* Wed Sep 22 2010 Fabian Groffen <fab...@cwi.nl> - 2.40.1-20101029
 - Improved uuid detection, to solve problems like bug #2675
 
-* Fri Sep 17 2010 Sjoerd Mullender <sjo...@acm.org> - 2.40.0-20101029
+* Fri Sep 17 2010 Sjoerd Mullender <sjo...@acm.org> - 2.40.1-20101029
 - Fixed a bug where the server silently ignored the last record in a
   COPY INTO if it was incomplete (e.g. missing a quote).
 
-* Mon Aug 30 2010 Sjoerd Mullender <sjo...@acm.org> - 2.40.0-20101029
+* Mon Aug 30 2010 Sjoerd Mullender <sjo...@acm.org> - 2.40.1-20101029
 - Fixed a crash of the server when an extremely complex query is
   attempted.  This is the latest incarnation of bug 104.
 
-* Tue Aug 24 2010 Arjen de Rijke <arjen.de.ri...@cwi.nl> - 2.40.0-20101029
+* Tue Aug 24 2010 Arjen de Rijke <arjen.de.ri...@cwi.nl> - 2.40.1-20101029
 - Add readonly property for databases to monetdb and merovingian.
 
-* Tue Aug 24 2010 Niels Nes <ni...@cwi.nl> - 2.40.0-20101029
+* Tue Aug 24 2010 Niels Nes <ni...@cwi.nl> - 2.40.1-20101029
 - make it possible to use '?' in offset and limit
 
 * Tue Aug 24 2010 Sjoerd Mullender <sjo...@acm.org> - 2.38.5-20100824
diff -r 9f649a98fbf2 -r 44f144d7eeb4 sql/debian/changelog
--- a/sql/debian/changelog      Wed Nov 10 20:47:51 2010 +0100
+++ b/sql/debian/changelog      Thu Nov 11 14:35:09 2010 +0100
@@ -16,53 +16,53 @@
 
  -- Sjoerd Mullender <sjo...@acm.org>  Fri, 05 Nov 2010 09:32:13 +0100
 
-monetdb-sql (2.40.0-20101029) unstable; urgency=low
+monetdb-sql (2.40.1-20101029) unstable; urgency=low
 
   * Rebuilt.
 
  -- Sjoerd Mullender <sjo...@acm.org>  Fri, 29 Oct 2010 10:30:31 +0200
 
-monetdb-sql (2.40.0-20101029) unstable; urgency=low
+monetdb-sql (2.40.1-20101029) unstable; urgency=low
 
   * Report a stopped and locked database as under maintenance, instead of
     without connections, bug #2685
 
  -- Fabian Groffen <fab...@cwi.nl>  Thu, 21 Oct 2010 10:30:31 +0200
 
-monetdb-sql (2.40.0-20101029) unstable; urgency=low
+monetdb-sql (2.40.1-20101029) unstable; urgency=low
 
   * Fixed bug 2695: crash when starting mserver in readonly mode on a
     new database.
 
  -- Sjoerd Mullender <sjo...@acm.org>  Mon, 18 Oct 2010 10:30:31 +0200
 
-monetdb-sql (2.40.0-20101029) unstable; urgency=low
+monetdb-sql (2.40.1-20101029) unstable; urgency=low
 
   * Improved uuid detection, to solve problems like bug #2675
 
  -- Fabian Groffen <fab...@cwi.nl>  Wed, 22 Sep 2010 10:30:31 +0200
 
-monetdb-sql (2.40.0-20101029) unstable; urgency=low
+monetdb-sql (2.40.1-20101029) unstable; urgency=low
 
   * Fixed a bug where the server silently ignored the last record in a
     COPY INTO if it was incomplete (e.g. missing a quote).
 
  -- Sjoerd Mullender <sjo...@acm.org>  Fri, 17 Sep 2010 10:30:31 +0200
 
-monetdb-sql (2.40.0-20101029) unstable; urgency=low
+monetdb-sql (2.40.1-20101029) unstable; urgency=low
 
   * Fixed a crash of the server when an extremely complex query is
     attempted.  This is the latest incarnation of bug 104.
 
  -- Sjoerd Mullender <sjo...@acm.org>  Mon, 30 Aug 2010 10:30:31 +0200
 
-monetdb-sql (2.40.0-20101029) unstable; urgency=low
+monetdb-sql (2.40.1-20101029) unstable; urgency=low
 
   * Add readonly property for databases to monetdb and merovingian.
 
  -- Arjen de Rijke <arjen.de.ri...@cwi.nl>  Tue, 24 Aug 2010 10:30:31 +0200
 
-monetdb-sql (2.40.0-20101029) unstable; urgency=low
+monetdb-sql (2.40.1-20101029) unstable; urgency=low
 
   * make it possible to use '?' in offset and limit
 
diff -r 9f649a98fbf2 -r 44f144d7eeb4 
sql/src/backends/monet5/merovingian/ChangeLog-Archive
--- a/sql/src/backends/monet5/merovingian/ChangeLog-Archive     Wed Nov 10 
20:47:51 2010 +0100
+++ b/sql/src/backends/monet5/merovingian/ChangeLog-Archive     Thu Nov 11 
14:35:09 2010 +0100
@@ -1,11 +1,11 @@
 # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
 # This file contains past ChangeLog entries
 
-* Thu Oct 21 2010 Fabian Groffen <fab...@cwi.nl> - 2.40.0-20101029
+* Thu Oct 21 2010 Fabian Groffen <fab...@cwi.nl> - 2.40.1-20101029
 - Report a stopped and locked database as under maintenance, instead of
   without connections, bug #2685
 
-* Fri Jul 16 2010 Arjen de Rijke <arjen.de.ri...@cwi.nl> - 2.40.0-20101029
+* Fri Jul 16 2010 Arjen de Rijke <arjen.de.ri...@cwi.nl> - 2.40.1-20101029
 - Add readonly property for databases to monetdb and merovingian.
 
 * Mon Jul 26 2010 Fabian Groffen <fab...@cwi.nl> - 2.38.5-20100823
diff -r 9f649a98fbf2 -r 44f144d7eeb4 sql/src/benchmarks/tpch/11.sql
--- a/sql/src/benchmarks/tpch/11.sql    Wed Nov 10 20:47:51 2010 +0100
+++ b/sql/src/benchmarks/tpch/11.sql    Thu Nov 11 14:35:09 2010 +0100
@@ -15,7 +15,9 @@
        sum(ps_supplycost * ps_availqty) >
        (
                select
-                       sum(ps_supplycost * ps_availqty) * 0.0001000000
+                       sum(ps_supplycost * ps_availqty) * 0.0100000000
+                       -- The above constant needs to be adjusted according
+                       -- to the scale factor (SF): constant = 0.0001 / SF.
                from
                        partsupp,
                        supplier,
diff -r 9f649a98fbf2 -r 44f144d7eeb4 
sql/src/benchmarks/tpch/Tests/01-22.stable.out
--- a/sql/src/benchmarks/tpch/Tests/01-22.stable.out    Wed Nov 10 20:47:51 
2010 +0100
+++ b/sql/src/benchmarks/tpch/Tests/01-22.stable.out    Thu Nov 11 14:35:09 
2010 +0100
@@ -403,364 +403,7 @@
 % int, decimal # type
 % 4,   21 # length
 [ 1376,        13271249.89     ]
-[ 788, 9498648.06      ]
-[ 1071,        9388264.40      ]
-[ 1768,        9207199.75      ]
-[ 1168,        8881908.96      ]
-[ 1084,        8709494.16      ]
-[ 1415,        8471489.56      ]
-[ 1338,        8293841.12      ]
-[ 124, 8203209.30      ]
-[ 1232,        8111663.34      ]
-[ 1643,        7975862.75      ]
-[ 1952,        7936947.61      ]
-[ 1944,        7880018.60      ]
-[ 1884,        7513422.84      ]
-[ 942, 7511018.76      ]
-[ 670, 7299956.80      ]
-[ 1532,        7222347.20      ]
-[ 1052,        7158586.00      ]
-[ 455, 7064285.84      ]
-[ 1176,        7060670.89      ]
-[ 143, 7037648.64      ]
-[ 1653,        6949533.70      ]
-[ 1140,        6929464.08      ]
-[ 1076,        6877472.96      ]
-[ 2000,        6720009.38      ]
-[ 348, 6681307.34      ]
-[ 810, 6576640.95      ]
-[ 943, 6458641.70      ]
-[ 720, 6391330.27      ]
-[ 1748,        6341530.40      ]
-[ 1241,        6304944.66      ]
-[ 1384,        6279261.12      ]
-[ 1784,        6247863.25      ]
-[ 984, 6136927.00      ]
-[ 445, 6127784.28      ]
-[ 1976,        6079237.08      ]
-[ 1609,        6022720.80      ]
-[ 1563,        5978195.08      ]
-[ 452, 5838052.00      ]
-[ 222, 5737162.24      ]
-[ 1629,        5703117.12      ]
-[ 1454,        5694804.18      ]
-[ 1082,        5681981.25      ]
-[ 691, 5633589.72      ]
-[ 1474,        5614673.64      ]
-[ 1900,        5591905.36      ]
-[ 262, 5553285.32      ]
-[ 1876,        5517997.59      ]
-[ 1027,        5490916.00      ]
-[ 1833,        5451495.00      ]
-[ 513, 5374426.22      ]
-[ 752, 5358919.70      ]
-[ 1367,        5352773.25      ]
-[ 543, 5189101.68      ]
-[ 1144,        5174388.56      ]
-[ 403, 5126118.15      ]
-[ 1406,        5121886.44      ]
-[ 320, 5072099.76      ]
-[ 1940,        5069178.40      ]
-[ 1503,        5050895.50      ]
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

Reply via email to