Changeset: 5fab7e0d50c7 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5fab7e0d50c7
Modified Files:
MonetDB/MonetDB.spec
MonetDB4/MonetDB-server.spec
MonetDB5/MonetDB-server.spec
clients/MonetDB-client.spec
clients/src/odbc/winsetup/MonetDB-ODBC-Installer/MonetDB-ODBC-Installer.vdproj
clients/src/odbc/winsetup/MonetDB-ODBC-Installer64/MonetDB-ODBC-Installer.vdproj
geom/MonetDB-geom.spec
geom/NT/MonetDB5-Geom/MonetDB5-Geom-Module.vdproj
geom/NT/MonetDB5-Geom64/MonetDB5-Geom-Module.vdproj
pathfinder/MonetDB-XQuery.spec
pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery-Installer.vdproj
pathfinder/NT/MonetDB4-XQuery64/MonetDB4-XQuery-Installer.vdproj
sql/ChangeLog.Jun2010
sql/MonetDB-SQL.spec
sql/NT/MonetDB5-SQL/MonetDB5-SQL-Installer.vdproj
sql/NT/MonetDB5-SQL64/MonetDB5-SQL-Installer.vdproj
sql/src/test/BugTracker-2010/Tests/All
testing/MonetDB-testing.spec
Branch: default
Log Message:
Merge with Jun2010 branch.
diffs (truncated from 453 to 300 lines):
diff -r e51b97960b05 -r 5fab7e0d50c7 .hgtags
--- a/.hgtags Fri Jul 09 10:41:48 2010 +0200
+++ b/.hgtags Fri Jul 09 12:31:02 2010 +0200
@@ -415,3 +415,5 @@
2077db505b7c36be4009ea92f0ce0c25600a4e22 Jun2010_3
2077db505b7c36be4009ea92f0ce0c25600a4e22 Jun2010_3
700a31b47b8a8fd449607d16f14c5c96d3c503cb Jun2010_3
+700a31b47b8a8fd449607d16f14c5c96d3c503cb Jun2010_3
+e4fe1c3cabfee2bba0b620aee6c3e9d569d37e17 Jun2010_3
diff -r e51b97960b05 -r 5fab7e0d50c7 MonetDB/MonetDB.spec
--- a/MonetDB/MonetDB.spec Fri Jul 09 10:41:48 2010 +0200
+++ b/MonetDB/MonetDB.spec Fri Jul 09 12:31:02 2010 +0200
@@ -106,6 +106,9 @@
%{_libdir}/libbat.so
%changelog
+* Fri Jul 09 2010 Sjoerd Mullender <sjo...@acm.org> - 1.38.3-20100709
+- Rebuilt.
+
* Wed Jun 30 2010 Sjoerd Mullender <sjo...@acm.org> - 1.38.1-20100630
- Rebuilt.
diff -r e51b97960b05 -r 5fab7e0d50c7 MonetDB/debian/changelog
--- a/MonetDB/debian/changelog Fri Jul 09 10:41:48 2010 +0200
+++ b/MonetDB/debian/changelog Fri Jul 09 12:31:02 2010 +0200
@@ -1,3 +1,9 @@
+monetdb (1.38.3-20100709) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender <sjo...@acm.org> Fri, 09 Jul 2010 11:44:10 +0200
+
monetdb (1.38.1-20100630) unstable; urgency=low
* Rebuilt.
diff -r e51b97960b05 -r 5fab7e0d50c7 MonetDB4/MonetDB-server.spec
--- a/MonetDB4/MonetDB-server.spec Fri Jul 09 10:41:48 2010 +0200
+++ b/MonetDB4/MonetDB-server.spec Fri Jul 09 12:31:02 2010 +0200
@@ -216,6 +216,9 @@
%{_libdir}/libembeddedmil.so
%changelog
+* Fri Jul 09 2010 Sjoerd Mullender <sjo...@acm.org> - 4.38.3-20100709
+- Rebuilt.
+
* Wed Jun 30 2010 Sjoerd Mullender <sjo...@acm.org> - 4.38.1-20100630
- Rebuilt.
diff -r e51b97960b05 -r 5fab7e0d50c7 MonetDB4/debian/changelog
--- a/MonetDB4/debian/changelog Fri Jul 09 10:41:48 2010 +0200
+++ b/MonetDB4/debian/changelog Fri Jul 09 12:31:02 2010 +0200
@@ -1,3 +1,9 @@
+monetdb4-server (4.38.3-20100709) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender <sjo...@acm.org> Fri, 09 Jul 2010 11:44:10 +0200
+
monetdb4-server (4.38.1-20100630) unstable; urgency=low
* Rebuilt.
diff -r e51b97960b05 -r 5fab7e0d50c7 MonetDB5/MonetDB-server.spec
--- a/MonetDB5/MonetDB-server.spec Fri Jul 09 10:41:48 2010 +0200
+++ b/MonetDB5/MonetDB-server.spec Fri Jul 09 12:31:02 2010 +0200
@@ -213,6 +213,9 @@
%{_libdir}/*.so
%changelog
+* Fri Jul 09 2010 Sjoerd Mullender <sjo...@acm.org> - 5.20.3-20100709
+- Rebuilt.
+
* 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.
diff -r e51b97960b05 -r 5fab7e0d50c7 MonetDB5/debian/changelog
--- a/MonetDB5/debian/changelog Fri Jul 09 10:41:48 2010 +0200
+++ b/MonetDB5/debian/changelog Fri Jul 09 12:31:02 2010 +0200
@@ -1,3 +1,9 @@
+monetdb5-server (5.20.3-20100709) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender <sjo...@acm.org> Fri, 09 Jul 2010 11:44:10 +0200
+
monetdb5-server (5.20.3-20100706) unstable; urgency=low
* Return a correct URI for local connection from Sabaoth when the
diff -r e51b97960b05 -r 5fab7e0d50c7 MonetDB5/src/modules/mal/Tests/remote10.mal
--- a/MonetDB5/src/modules/mal/Tests/remote10.mal Fri Jul 09 10:41:48
2010 +0200
+++ b/MonetDB5/src/modules/mal/Tests/remote10.mal Fri Jul 09 12:31:02
2010 +0200
@@ -1,9 +1,9 @@
-function octopus.qry(version:int):bat[:oid,:int];
+function user.qry(version:int):bat[:oid,:int];
b:= bat.new(:oid,:int);
bat.append(b,23);
return qry:= b;
-end octopus.qry;
+end user.qry;
uri := sabaoth.getLocalConnectionURI();
conn:str:= remote.connect(uri, "monetdb", "monetdb");
-remote.register(conn, "octopus", "qry");
+remote.register(conn, "user", "qry");
diff -r e51b97960b05 -r 5fab7e0d50c7
MonetDB5/src/modules/mal/Tests/remote10.stable.out
--- a/MonetDB5/src/modules/mal/Tests/remote10.stable.out Fri Jul 09
10:41:48 2010 +0200
+++ b/MonetDB5/src/modules/mal/Tests/remote10.stable.out Fri Jul 09
12:31:02 2010 +0200
@@ -11,8 +11,10 @@
# Copyright (c) 1993-July 2008 CWI.
# Copyright (c) August 2008-2009 MonetDB B.V., all rights reserved
# Visit http://monetdb.cwi.nl/ for further information
-# Listening for connection requests on mapi:monetdb://eir.ins.cwi.nl:38844/
-function octopus.qry(version:int):bat[:oid,:int];
+# Listening for connection requests on mapi:monetdb://volund.ins.cwi.nl:37285/
+# MonetDB/SQL module v2.38.3 loaded
+# MonetDB/GIS module v0.18.0 loaded
+function user.qry(version:int):bat[:oid,:int];
b := bat.new(:oid,:int);
bat.append(b,23);
return qry := b;
@@ -20,7 +22,7 @@
function user.main():void;
uri := sabaoth.getLocalConnectionURI();
conn:str := remote.connect(uri,"monetdb","monetdb");
- remote.register(conn,"octopus","qry");
+ remote.register(conn,"user","qry");
end main;
diff -r e51b97960b05 -r 5fab7e0d50c7 clients/MonetDB-client.spec
--- a/clients/MonetDB-client.spec Fri Jul 09 10:41:48 2010 +0200
+++ b/clients/MonetDB-client.spec Fri Jul 09 12:31:02 2010 +0200
@@ -301,6 +301,9 @@
%{_libdir}/MonetDB/Tests/*
%changelog
+* Fri Jul 09 2010 Sjoerd Mullender <sjo...@acm.org> - 1.38.3-20100709
+- Rebuilt.
+
* Mon Jul 5 2010 Sjoerd Mullender <sjo...@acm.org> - 1.38.3-20100706
- Implemented dumping of GRANT statements.
This fixes bug 2574.
diff -r e51b97960b05 -r 5fab7e0d50c7 clients/debian/changelog
--- a/clients/debian/changelog Fri Jul 09 10:41:48 2010 +0200
+++ b/clients/debian/changelog Fri Jul 09 12:31:02 2010 +0200
@@ -1,3 +1,9 @@
+monetdb-client (1.38.3-20100709) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender <sjo...@acm.org> Fri, 09 Jul 2010 11:44:10 +0200
+
monetdb-client (1.38.3-20100706) unstable; urgency=low
* Implemented dumping of GRANT statements.
diff -r e51b97960b05 -r 5fab7e0d50c7 geom/MonetDB-geom.spec
--- a/geom/MonetDB-geom.spec Fri Jul 09 10:41:48 2010 +0200
+++ b/geom/MonetDB-geom.spec Fri Jul 09 12:31:02 2010 +0200
@@ -172,6 +172,9 @@
%endif
%changelog
+* Fri Jul 09 2010 Sjoerd Mullender <sjo...@acm.org> - 0.18.3-20100709
+- Rebuilt.
+
* Wed Jun 30 2010 Sjoerd Mullender <sjo...@acm.org> - 0.18.1-20100630
- Rebuilt.
diff -r e51b97960b05 -r 5fab7e0d50c7 geom/debian/changelog
--- a/geom/debian/changelog Fri Jul 09 10:41:48 2010 +0200
+++ b/geom/debian/changelog Fri Jul 09 12:31:02 2010 +0200
@@ -1,3 +1,9 @@
+monetdb-geom (0.18.3-20100709) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender <sjo...@acm.org> Fri, 09 Jul 2010 11:44:10 +0200
+
monetdb-geom (0.18.1-20100630) unstable; urgency=low
* Rebuilt.
diff -r e51b97960b05 -r 5fab7e0d50c7 pathfinder/MonetDB-XQuery.spec
--- a/pathfinder/MonetDB-XQuery.spec Fri Jul 09 10:41:48 2010 +0200
+++ b/pathfinder/MonetDB-XQuery.spec Fri Jul 09 12:31:02 2010 +0200
@@ -138,6 +138,9 @@
%{_bindir}/monetdb-xquery-config
%changelog
+* Fri Jul 09 2010 Sjoerd Mullender <sjo...@acm.org> - 0.38.3-20100709
+- Rebuilt.
+
* Wed Jun 30 2010 Sjoerd Mullender <sjo...@acm.org> - 0.38.1-20100630
- Rebuilt.
diff -r e51b97960b05 -r 5fab7e0d50c7 pathfinder/debian/changelog
--- a/pathfinder/debian/changelog Fri Jul 09 10:41:48 2010 +0200
+++ b/pathfinder/debian/changelog Fri Jul 09 12:31:02 2010 +0200
@@ -1,3 +1,9 @@
+monetdb-xquery (0.38.3-20100709) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender <sjo...@acm.org> Fri, 09 Jul 2010 11:44:10 +0200
+
monetdb-xquery (0.38.1-20100630) unstable; urgency=low
* Rebuilt.
diff -r e51b97960b05 -r 5fab7e0d50c7 sql/ChangeLog.Jun2010
--- a/sql/ChangeLog.Jun2010 Fri Jul 09 10:41:48 2010 +0200
+++ b/sql/ChangeLog.Jun2010 Fri Jul 09 12:31:02 2010 +0200
@@ -1,14 +1,3 @@
# ChangeLog file for sql
# This file is updated with Maddlog
-* Thu Jul 8 2010 Fabian Groffen <fab...@cwi.nl>
-- Improved error message for certain type-related problems by including the
affected column name.
-
-* Wed Jul 7 2010 Fabian Groffen <fab...@cwi.nl>
-- Make TEXT a separate keyword, separating it from CLOB, such that we can
sloppily allow TEXT to appear as a column name, since it seems not to be in the
standard as reserved keyword.
-
-* Wed Jul 7 2010 Niels Nes <ni...@cwi.nl>
-- Fixed bug 2581. Completed the implementation of handling boolean types in
prepare statements.
-- Fix bug 2582. Statements with 'constant in ( )' are now handled properly.
-- Fixed bug 2583 + added test. The assert was incorrect.
-
diff -r e51b97960b05 -r 5fab7e0d50c7 sql/MonetDB-SQL.spec
--- a/sql/MonetDB-SQL.spec Fri Jul 09 10:41:48 2010 +0200
+++ b/sql/MonetDB-SQL.spec Fri Jul 09 12:31:02 2010 +0200
@@ -157,6 +157,20 @@
%{_libdir}/libembeddedsql5.so
%changelog
+* Fri Jul 09 2010 Sjoerd Mullender <sjo...@acm.org> - 2.38.3-20100709
+- Rebuilt.
+
+* Thu Jul 8 2010 Fabian Groffen <fab...@cwi.nl> - 2.38.3-20100709
+- Improved error message for certain type-related problems by including the
affected column name.
+
+* Wed Jul 7 2010 Fabian Groffen <fab...@cwi.nl> - 2.38.3-20100709
+- Make TEXT a separate keyword, separating it from CLOB, such that we can
sloppily allow TEXT to appear as a column name, since it seems not to be in the
standard as reserved keyword.
+
+* Wed Jul 7 2010 Niels Nes <ni...@cwi.nl> - 2.38.3-20100709
+- Fixed bug 2581. Completed the implementation of handling boolean types in
prepare statements.
+- Fix bug 2582. Statements with 'constant in ( )' are now handled properly.
+- Fixed bug 2583 + added test. The assert was incorrect.
+
* 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
diff -r e51b97960b05 -r 5fab7e0d50c7 sql/debian/changelog
--- a/sql/debian/changelog Fri Jul 09 10:41:48 2010 +0200
+++ b/sql/debian/changelog Fri Jul 09 12:31:02 2010 +0200
@@ -1,3 +1,29 @@
+monetdb-sql (2.38.3-20100709) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender <sjo...@acm.org> Fri, 09 Jul 2010 11:44:11 +0200
+
+monetdb-sql (2.38.3-20100709) unstable; urgency=low
+
+ * Improved error message for certain type-related problems by including the
affected column name.
+
+ -- Fabian Groffen <fab...@cwi.nl> Thu, 8 Jul 2010 11:44:11 +0200
+
+monetdb-sql (2.38.3-20100709) unstable; urgency=low
+
+ * Make TEXT a separate keyword, separating it from CLOB, such that we can
sloppily allow TEXT to appear as a column name, since it seems not to be in the
standard as reserved keyword.
+
+ -- Fabian Groffen <fab...@cwi.nl> Wed, 7 Jul 2010 11:44:11 +0200
+
+monetdb-sql (2.38.3-20100709) unstable; urgency=low
+
+ * Fixed bug 2581. Completed the implementation of handling boolean types in
prepare statements.
+ * Fix bug 2582. Statements with 'constant in ( )' are now handled properly.
+ * Fixed bug 2583 + added test. The assert was incorrect.
+
+ -- Niels Nes <ni...@cwi.nl> Wed, 7 Jul 2010 11:44:11 +0200
+
monetdb-sql (2.38.3-20100706) unstable; urgency=low
* Fixed bug in zero_or_one
diff -r e51b97960b05 -r 5fab7e0d50c7 sql/src/test/BugTracker-2010/Tests/All
--- a/sql/src/test/BugTracker-2010/Tests/All Fri Jul 09 10:41:48 2010 +0200
+++ b/sql/src/test/BugTracker-2010/Tests/All Fri Jul 09 12:31:02 2010 +0200
@@ -24,3 +24,4 @@
prepare_on_boolean_bug.Bug-2581
prepare_statements_crash_server.Bug-2599
and_not_broken.Bug-2602
+insert-into-except.Bug-2569
diff -r e51b97960b05 -r 5fab7e0d50c7
sql/src/test/BugTracker-2010/Tests/insert-into-except.Bug-2569.sql
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sql/src/test/BugTracker-2010/Tests/insert-into-except.Bug-2569.sql
Fri Jul 09 12:31:02 2010 +0200
@@ -0,0 +1,14 @@
+-- http://bugs.monetdb.org/show_bug.cgi?id=2569
+
+create table tmp_a (node integer, k varchar(255), v varchar(1024));
+create table tmp_b (node integer, k varchar(255), v varchar(1024));
+
+insert into tmp_a values (1,'a','a');
+insert into tmp_b values (1,'a','a');
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
