Changeset: f7fd9e201986 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f7fd9e201986
Modified Files:
        MonetDB/MonetDB.spec
        MonetDB4/MonetDB-server.spec
        MonetDB5/MonetDB-server.spec
        clients/MonetDB-client.spec
        geom/MonetDB-geom.spec
        pathfinder/MonetDB-XQuery.spec
        sql/ChangeLog.Jun2010
        sql/MonetDB-SQL.spec
        testing/MonetDB-testing.spec
Branch: default
Log Message:

Merge with Jun2010 branch.


diffs (281 lines):

diff -r d75ef007c08f -r f7fd9e201986 .hgtags
--- a/.hgtags   Tue Jul 06 17:06:48 2010 +0200
+++ b/.hgtags   Tue Jul 06 17:12:03 2010 +0200
@@ -412,3 +412,6 @@
 c0927c19d26910bb3fb5a5acba438a0ca5bba182 Jun2010_1
 c0927c19d26910bb3fb5a5acba438a0ca5bba182 Jun2010_1
 e042ecc2e895b1bb5f06da65d0db6a8756cdb6d3 Jun2010_1
+2077db505b7c36be4009ea92f0ce0c25600a4e22 Jun2010_3
+2077db505b7c36be4009ea92f0ce0c25600a4e22 Jun2010_3
+700a31b47b8a8fd449607d16f14c5c96d3c503cb Jun2010_3
diff -r d75ef007c08f -r f7fd9e201986 MonetDB/MonetDB.spec
--- a/MonetDB/MonetDB.spec      Tue Jul 06 17:06:48 2010 +0200
+++ b/MonetDB/MonetDB.spec      Tue Jul 06 17:12:03 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/%{name}-%{version}.tar.gz
+Source: 
http://dev.monetdb.org/downloads/sources/Jun2010-SP1/%{name}-%{version}.tar.gz
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires: zlib-devel, bzip2-devel, openssl-devel
diff -r d75ef007c08f -r f7fd9e201986 MonetDB4/MonetDB-server.spec
--- a/MonetDB4/MonetDB-server.spec      Tue Jul 06 17:06:48 2010 +0200
+++ b/MonetDB4/MonetDB-server.spec      Tue Jul 06 17:12:03 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/MonetDB4-server-%{version}.tar.gz
+Source: 
http://dev.monetdb.org/downloads/sources/Jun2010-SP1/MonetDB4-server-%{version}.tar.gz
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 Requires(pre): shadow-utils
diff -r d75ef007c08f -r f7fd9e201986 MonetDB5/ChangeLog.Jun2010
--- a/MonetDB5/ChangeLog.Jun2010        Tue Jul 06 17:06:48 2010 +0200
+++ b/MonetDB5/ChangeLog.Jun2010        Tue Jul 06 17:12:03 2010 +0200
@@ -1,15 +1,3 @@
 # ChangeLog file for MonetDB5
 # This file is updated with Maddlog
 
-* Thr Jul 01 2010 Fabian Groffen <fab...@cwi.nl>
-- Return a correct URI for local connection from Sabaoth when the
-  connection is a UNIX domain socket.  Partial fix for bug #2567.
-
-* Wed Jun 30 2010 Stefan Manegold <stefan.maneg...@cwi.nl>
-- various performance fixes in grouping and grouped aggregation code
-  (MonetDB5/src/modules/kernel/group.mx, MonetDB5/src/modules/kernel/aggr*.mx)
-  to reduce the execution time the following query that mimics a two-column
-  primary key check over the ~5 billion tuple "neighbors" table of the
-  Skyserver database from 26 hours to 1.5 hours (on a 64 GB machine):
-  SELECT count(c), sum(c), min(c), max(c) FROM (SELECT count(*) AS c FROM 
"neighbors" GROUP BY "objID","NeighborObjID") AS t;
-
diff -r d75ef007c08f -r f7fd9e201986 MonetDB5/MonetDB-server.spec
--- a/MonetDB5/MonetDB-server.spec      Tue Jul 06 17:06:48 2010 +0200
+++ b/MonetDB5/MonetDB-server.spec      Tue Jul 06 17:12:03 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/MonetDB5-server-%{version}.tar.gz
+Source: 
http://dev.monetdb.org/downloads/sources/Jun2010-SP1/MonetDB5-server-%{version}.tar.gz
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 %{!?_with_raptor: %{!?_without_raptor: %define _with_raptor --with-raptor}}
@@ -213,6 +213,18 @@
 %{_libdir}/*.so
 
 %changelog
+* Thu Jul 01 2010 Fabian Groffen <fab...@cwi.nl> - 5.20.3-20100706
+- Return a correct URI for local connection from Sabaoth when the
+  connection is a UNIX domain socket.  Partial fix for bug #2567.
+
+* Wed Jun 30 2010 Stefan Manegold <stefan.maneg...@cwi.nl> - 5.20.3-20100706
+- various performance fixes in grouping and grouped aggregation code
+  (MonetDB5/src/modules/kernel/group.mx, MonetDB5/src/modules/kernel/aggr*.mx)
+  to reduce the execution time the following query that mimics a two-column
+  primary key check over the ~5 billion tuple "neighbors" table of the
+  Skyserver database from 26 hours to 1.5 hours (on a 64 GB machine):
+  SELECT count(c), sum(c), min(c), max(c) FROM (SELECT count(*) AS c FROM 
"neighbors" GROUP BY "objID","NeighborObjID") AS t;
+
 * Wed Jun 30 2010 Sjoerd Mullender <sjo...@acm.org> - 5.20.1-20100630
 - Rebuilt.
 
diff -r d75ef007c08f -r f7fd9e201986 MonetDB5/debian/changelog
--- a/MonetDB5/debian/changelog Tue Jul 06 17:06:48 2010 +0200
+++ b/MonetDB5/debian/changelog Tue Jul 06 17:12:03 2010 +0200
@@ -1,3 +1,21 @@
+monetdb5-server (5.20.3-20100706) unstable; urgency=low
+
+  * Return a correct URI for local connection from Sabaoth when the
+    connection is a UNIX domain socket.  Partial fix for bug #2567.
+
+ -- Fabian Groffen <fab...@cwi.nl>  Thu, 01 Jul 2010 14:06:18 +0200
+
+monetdb5-server (5.20.3-20100706) unstable; urgency=low
+
+  * various performance fixes in grouping and grouped aggregation code
+    (MonetDB5/src/modules/kernel/group.mx, 
MonetDB5/src/modules/kernel/aggr*.mx)
+    to reduce the execution time the following query that mimics a two-column
+    primary key check over the ~5 billion tuple "neighbors" table of the
+    Skyserver database from 26 hours to 1.5 hours (on a 64 GB machine):
+    SELECT count(c), sum(c), min(c), max(c) FROM (SELECT count(*) AS c FROM 
"neighbors" GROUP BY "objID","NeighborObjID") AS t;
+
+ -- Stefan Manegold <stefan.maneg...@cwi.nl>  Wed, 30 Jun 2010 14:06:18 +0200
+
 monetdb5-server (5.20.1-20100630) unstable; urgency=low
 
   * Rebuilt.
diff -r d75ef007c08f -r f7fd9e201986 clients/ChangeLog.Jun2010
--- a/clients/ChangeLog.Jun2010 Tue Jul 06 17:06:48 2010 +0200
+++ b/clients/ChangeLog.Jun2010 Tue Jul 06 17:12:03 2010 +0200
@@ -1,10 +1,3 @@
 # ChangeLog file for clients
 # This file is updated with Maddlog
 
-* Mon Jul  5 2010 Sjoerd Mullender <sjo...@acm.org>
-- Implemented dumping of GRANT statements.
-  This fixes bug 2574.
-
-* Thr Jul  1 2010 Fabian Groffen <fab...@cwi.nl>
-- Fix implementation of mapi_mapiuri to deal with UNIX socket urls
-  properly.  This fixes one part of Bug #2567.
diff -r d75ef007c08f -r f7fd9e201986 clients/MonetDB-client.spec
--- a/clients/MonetDB-client.spec       Tue Jul 06 17:06:48 2010 +0200
+++ b/clients/MonetDB-client.spec       Tue Jul 06 17:12:03 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/MonetDB-client-%{version}.tar.gz
+Source: 
http://dev.monetdb.org/downloads/sources/Jun2010-SP1/MonetDB-client-%{version}.tar.gz
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 Requires: MonetDB >= 1.38
@@ -301,6 +301,14 @@
 %{_libdir}/MonetDB/Tests/*
 
 %changelog
+* Mon Jul  5 2010 Sjoerd Mullender <sjo...@acm.org> - 1.38.3-20100706
+- Implemented dumping of GRANT statements.
+  This fixes bug 2574.
+
+* Thu Jul  1 2010 Fabian Groffen <fab...@cwi.nl> - 1.38.3-20100706
+- Fix implementation of mapi_mapiuri to deal with UNIX socket urls
+  properly.  This fixes one part of Bug #2567.
+
 * Wed Jun 30 2010 Sjoerd Mullender <sjo...@acm.org> - 1.38.1-20100630
 - Rebuilt.
 
diff -r d75ef007c08f -r f7fd9e201986 clients/debian/changelog
--- a/clients/debian/changelog  Tue Jul 06 17:06:48 2010 +0200
+++ b/clients/debian/changelog  Tue Jul 06 17:12:03 2010 +0200
@@ -1,3 +1,16 @@
+monetdb-client (1.38.3-20100706) unstable; urgency=low
+
+  * Implemented dumping of GRANT statements.
+    This fixes bug 2574.
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Mon, 5 Jul 2010 14:06:18 +0200
+
+monetdb-client (1.38.3-20100706) unstable; urgency=low
+
+  * Fix implementation of mapi_mapiuri to deal with UNIX socket urls
+
+ -- Fabian Groffen <fab...@cwi.nl>  Thu, 1 Jul 2010 14:06:18 +0200
+
 monetdb-client (1.38.1-20100630) unstable; urgency=low
 
   * Rebuilt.
diff -r d75ef007c08f -r f7fd9e201986 geom/MonetDB-geom.spec
--- a/geom/MonetDB-geom.spec    Tue Jul 06 17:06:48 2010 +0200
+++ b/geom/MonetDB-geom.spec    Tue Jul 06 17:12:03 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/MonetDB-geom-%{version}.tar.gz
+Source: 
http://dev.monetdb.org/downloads/sources/Jun2010-SP1/MonetDB-geom-%{version}.tar.gz
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 %{!?_with_monetdb4: %{!?_without_monetdb4: %define _without_monetdb4 
--without-monetdb4}}
diff -r d75ef007c08f -r f7fd9e201986 pathfinder/MonetDB-XQuery.spec
--- a/pathfinder/MonetDB-XQuery.spec    Tue Jul 06 17:06:48 2010 +0200
+++ b/pathfinder/MonetDB-XQuery.spec    Tue Jul 06 17:12:03 2010 +0200
@@ -21,7 +21,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/MonetDB-XQuery-%{version}.tar.gz
+Source: 
http://dev.monetdb.org/downloads/sources/Jun2010-SP1/MonetDB-XQuery-%{version}.tar.gz
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 Requires: MonetDB4-server >= 4.38
diff -r d75ef007c08f -r f7fd9e201986 sql/ChangeLog.Jun2010
--- a/sql/ChangeLog.Jun2010     Tue Jul 06 17:06:48 2010 +0200
+++ b/sql/ChangeLog.Jun2010     Tue Jul 06 17:12:03 2010 +0200
@@ -1,15 +1,3 @@
 # ChangeLog file for sql
 # This file is updated with Maddlog
 
-* Mon Jul  5 2010 Niels Nes <ni...@cwi.nl>
-- Fixed bug in zero_or_one
-- Fixed bug in dead code elimination for projections with distinct
-- Fixed bug handling join with constant values on both sides (like group 
results and constants)
-- fixed bug in UPDATE TABLE when updating multiple rows
-
-* Wed Jun 30 2010 Stefan Manegold <stefan.maneg...@cwi.nl>
-- fixed bug 2564:
-  in case group by column is not found as alias in projection list,
-  fall back to check plain input columns
-  in order to find the underlying BAT and check its sortedness
-
diff -r d75ef007c08f -r f7fd9e201986 sql/MonetDB-SQL.spec
--- a/sql/MonetDB-SQL.spec      Tue Jul 06 17:06:48 2010 +0200
+++ b/sql/MonetDB-SQL.spec      Tue Jul 06 17:12:03 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/MonetDB-SQL-%{version}.tar.gz
+Source: 
http://dev.monetdb.org/downloads/sources/Jun2010-SP1/MonetDB-SQL-%{version}.tar.gz
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires: e2fsprogs-devel
@@ -157,6 +157,18 @@
 %{_libdir}/libembeddedsql5.so
 
 %changelog
+* Mon Jul  5 2010 Niels Nes <ni...@cwi.nl> - 2.38.3-20100706
+- Fixed bug in zero_or_one
+- Fixed bug in dead code elimination for projections with distinct
+- Fixed bug handling join with constant values on both sides (like group 
results and constants)
+- fixed bug in UPDATE TABLE when updating multiple rows
+
+* Wed Jun 30 2010 Stefan Manegold <stefan.maneg...@cwi.nl> - 2.38.3-20100706
+- fixed bug 2564:
+  in case group by column is not found as alias in projection list,
+  fall back to check plain input columns
+  in order to find the underlying BAT and check its sortedness
+
 * Wed Jun 30 2010 Sjoerd Mullender <sjo...@acm.org> - 2.38.1-20100630
 - Rebuilt.
 
diff -r d75ef007c08f -r f7fd9e201986 sql/debian/changelog
--- a/sql/debian/changelog      Tue Jul 06 17:06:48 2010 +0200
+++ b/sql/debian/changelog      Tue Jul 06 17:12:03 2010 +0200
@@ -1,3 +1,21 @@
+monetdb-sql (2.38.3-20100706) unstable; urgency=low
+
+  * Fixed bug in zero_or_one
+  * Fixed bug in dead code elimination for projections with distinct
+  * Fixed bug handling join with constant values on both sides (like group 
results and constants)
+  * fixed bug in UPDATE TABLE when updating multiple rows
+
+ -- Niels Nes <ni...@cwi.nl>  Mon, 5 Jul 2010 14:06:18 +0200
+
+monetdb-sql (2.38.3-20100706) unstable; urgency=low
+
+  * fixed bug 2564:
+    in case group by column is not found as alias in projection list,
+    fall back to check plain input columns
+    in order to find the underlying BAT and check its sortedness
+
+ -- Stefan Manegold <stefan.maneg...@cwi.nl>  Wed, 30 Jun 2010 14:06:18 +0200
+
 monetdb-sql (2.38.1-20100630) unstable; urgency=low
 
   * Rebuilt.
diff -r d75ef007c08f -r f7fd9e201986 testing/MonetDB-testing.spec
--- a/testing/MonetDB-testing.spec      Tue Jul 06 17:06:48 2010 +0200
+++ b/testing/MonetDB-testing.spec      Tue Jul 06 17:12:03 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/MonetDB-testing-%{version}.tar.gz
+Source: 
http://dev.monetdb.org/downloads/sources/Jun2010-SP1/MonetDB-testing-%{version}.tar.gz
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 Obsoletes: MonetDB-python
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

Reply via email to