MonetDB: default - Merge with Jun2010 branch.
Changeset: 7d94f618011d for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7d94f618011d
Modified Files:
pathfinder/tests/BugTracker/Tests/All
Branch: default
Log Message:
Merge with Jun2010 branch.
diffs (76 lines):
diff -r be877d766c25 -r 7d94f618011d pathfinder/tests/BugTracker/Tests/All
--- a/pathfinder/tests/BugTracker/Tests/All Mon Aug 30 23:47:43 2010 +0200
+++ b/pathfinder/tests/BugTracker/Tests/All Tue Aug 31 13:39:55 2010 +0200
@@ -214,3 +214,4 @@
slow_compilation.SF-2898944
node-name.Bug-2600.-d10
node-name.Bug-2600.-d0
+tijah-tokenize-concat.Bug-2009
diff -r be877d766c25 -r 7d94f618011d
pathfinder/tests/BugTracker/Tests/tijah-tokenize-concat.Bug-2009.stable.err
--- /dev/null Thu Jan 01 00:00:00 1970 +
+++
b/pathfinder/tests/BugTracker/Tests/tijah-tokenize-concat.Bug-2009.stable.err
Tue Aug 31 13:39:55 2010 +0200
@@ -0,0 +1,17 @@
+stderr of test 'tijah-tokenize-concat.Bug-2009` in directory
'tests/BugTracker` itself:
+
+
+# 13:33:08 >
+# 13:33:08 > Mserver "--config=/ufs/sjoerd/Monet-stable/etc/MonetDB.conf"
--debug=10 --set gdk_nr_threads=1 --set
"monet_mod_path=/ufs/sjoerd/Monet-stable/lib64/MonetDB4:/ufs/sjoerd/Monet-stable/lib64/MonetDB4/lib:/ufs/sjoerd/Monet-stable/lib64/MonetDB4/bin"
--set "gdk_dbfarm=/ufs/sjoerd/Monet-stable/var/MonetDB4/dbfarm" --set
mapi_open=true --set xrpc_open=true --set mapi_port=37473 --set xrpc_port=48309
--set monet_prompt= --trace "--dbname=mTests_tests_BugTracker" "--dbinit=
module(pathfinder);" ; echo ; echo Over..
+# 13:33:08 >
+
+
+# 13:33:10 >
+# 13:33:10 > mclient -lxquery -fxml --host=ottar --port=37473
tijah-tokenize-concat.Bug-2009.xq
+# 13:33:10 >
+
+
+# 13:33:10 >
+# 13:33:10 > Done.
+# 13:33:10 >
+
diff -r be877d766c25 -r 7d94f618011d
pathfinder/tests/BugTracker/Tests/tijah-tokenize-concat.Bug-2009.stable.out
--- /dev/null Thu Jan 01 00:00:00 1970 +
+++
b/pathfinder/tests/BugTracker/Tests/tijah-tokenize-concat.Bug-2009.stable.out
Tue Aug 31 13:39:55 2010 +0200
@@ -0,0 +1,37 @@
+stdout of test 'tijah-tokenize-concat.Bug-2009` in directory
'tests/BugTracker` itself:
+
+
+# 13:33:08 >
+# 13:33:08 > Mserver "--config=/ufs/sjoerd/Monet-stable/etc/MonetDB.conf"
--debug=10 --set gdk_nr_threads=1 --set
"monet_mod_path=/ufs/sjoerd/Monet-stable/lib64/MonetDB4:/ufs/sjoerd/Monet-stable/lib64/MonetDB4/lib:/ufs/sjoerd/Monet-stable/lib64/MonetDB4/bin"
--set "gdk_dbfarm=/ufs/sjoerd/Monet-stable/var/MonetDB4/dbfarm" --set
mapi_open=true --set xrpc_open=true --set mapi_port=37473 --set xrpc_port=48309
--set monet_prompt= --trace "--dbname=mTests_tests_BugTracker" "--dbinit=
module(pathfinder);" ; echo ; echo Over..
+# 13:33:08 >
+
+# MonetDB Server v4.38.4
+# based on GDK v1.38.4
+# not released
+# Copyright (c) 1993-July 2008, CWI. All rights reserved.
+# Copyright (c) August 2008-2010, MonetDB B.V.. All rights reserved.
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs; dynamically
linked.
+# Detected 7.751 GiB (8322707456 bytes) main-memory.
+# Visit http://monetdb.cwi.nl/ for further information.
+# PF/Tijah module v0.13.0 loaded. http://dbappl.cs.utwente.nl/pftijah
+# MonetDB/XQuery module v0.38.5 loaded (default back-end is 'algebra')
+# XRPC administrative console at http://127.0.0.1:48309/admin
+
+printf("\nReady.\n");
+
+Ready.
+quit();
+
+Over..
+
+# 13:33:10 >
+# 13:33:10 > mclient -lxquery -fxml --host=ottar --port=37473
tijah-tokenize-concat.Bug-2009.xq
+# 13:33:10 >
+
+
+hallo wereld
+
+# 13:33:10 >
+# 13:33:10 > Done.
+# 13:33:10 >
+
diff -r be877d766c25 -r 7d94f618011d
pathfinder/tests/BugTracker/Tests/tijah-tokenize-concat.Bug-2009.xq
--- /dev/null Thu Jan 01 00:00:00 1970 +
+++ b/pathfinder/tests/BugTracker/Tests/tijah-tokenize-concat.Bug-2009.xq
Tue Aug 31 13:39:55 2010 +0200
@@ -0,0 +1,2 @@
+let $record := foo
+return {tijah:tokenize(concat($record/Bijschrift_NL/text(), " Hallo
wereld!"))}
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merge with Jun2010 branch (no changes).
Changeset: 68703bed9e26 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=68703bed9e26 Modified Files: sql/src/test/BugDay_2005-10-06_2.9.3/Tests/All Branch: default Log Message: Merge with Jun2010 branch (no changes). ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merge with Jun2010 branch.
Changeset: a9294382f85d for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a9294382f85d Modified Files: sql/ChangeLog.Jun2010 Branch: default Log Message: Merge with Jun2010 branch. diffs (11 lines): diff -r 4b7de918e706 -r a9294382f85d sql/ChangeLog.Jun2010 --- a/sql/ChangeLog.Jun2010 Mon Aug 30 17:00:00 2010 +0200 +++ b/sql/ChangeLog.Jun2010 Mon Aug 30 17:04:06 2010 +0200 @@ -1,3 +1,7 @@ # ChangeLog file for sql # This file is updated with Maddlog +* Mon Aug 30 2010 Sjoerd Mullender +- Fixed a crash of the server when an extremely complex query is + attempted. This is the latest incarnation of bug 104. + ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merge with Jun2010 branch.
Changeset: 4b7de918e706 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4b7de918e706
Modified Files:
MonetDB5/src/mal/mal_scenario.mx
sql/src/backends/monet5/sql_scenario.mx
Branch: default
Log Message:
Merge with Jun2010 branch.
diffs (35 lines):
diff -r 0c493ed52585 -r 4b7de918e706 MonetDB5/src/mal/mal_scenario.mx
--- a/MonetDB5/src/mal/mal_scenario.mx Mon Aug 30 14:54:09 2010 +0200
+++ b/MonetDB5/src/mal/mal_scenario.mx Mon Aug 30 17:00:00 2010 +0200
@@ -623,7 +623,7 @@
if (setjmp( c->exception_buf) < 0)
c->mode = FINISHING;
#ifdef HAVE_TIMES
- times(&t0);
+ times(&t0);
#endif
while (c->mode > FINISHING || msg != MAL_SUCCEED) {
if (msg != MAL_SUCCEED){
diff -r 0c493ed52585 -r 4b7de918e706 sql/src/backends/monet5/sql_scenario.mx
--- a/sql/src/backends/monet5/sql_scenario.mx Mon Aug 30 14:54:09 2010 +0200
+++ b/sql/src/backends/monet5/sql_scenario.mx Mon Aug 30 17:00:00 2010 +0200
@@ -1306,6 +1306,10 @@
m->type,/* the type of the statement
*/
sql_escape_str(QUERY(m->scanner)));
+ /* passed over to query cache */
+ m->sa = NULL;
+ m->sym = NULL;
+
scanner_query_processed(&(m->scanner));
be->q->code =
(backend_code)backend_dumpproc(be, c, be->q, s);
@@ -1314,8 +1318,6 @@
be->q->name = putName(be->q->name, strlen(be->q->name));
if (m->emode == m_normal && m->emod == mod_none)
m->emode = m_inplace;
- m->sa = NULL;
- m->sym = NULL;
}
stmt_destroy(s);
}
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merge with Jun2010 branch.
Changeset: 0c493ed52585 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0c493ed52585
Modified Files:
sql/src/test/BugTracker-2010/Tests/All
Branch: default
Log Message:
Merge with Jun2010 branch.
diffs (152 lines):
diff -r eb65fd02d465 -r 0c493ed52585 sql/src/test/BugTracker-2010/Tests/All
--- a/sql/src/test/BugTracker-2010/Tests/AllMon Aug 30 14:41:28 2010 +0200
+++ b/sql/src/test/BugTracker-2010/Tests/AllMon Aug 30 14:54:09 2010 +0200
@@ -30,6 +30,7 @@
predicate_in_select.Bug-2535
subselect.Bug-2537
group-by_ordered_column.Bug-2564
+incomplete-utf8-sequence.Bug-2575
ORDER_BY_over_UNION_EXCEPT_INTERSECT.Bug-2606
second_function_existing_signature.Bug-2611
update_statement_in_function_ignored.Bug-2614
diff -r eb65fd02d465 -r 0c493ed52585
sql/src/test/BugTracker-2010/Tests/incomplete-utf8-sequence.Bug-2575.sql
--- /dev/null Thu Jan 01 00:00:00 1970 +
+++ b/sql/src/test/BugTracker-2010/Tests/incomplete-utf8-sequence.Bug-2575.sql
Mon Aug 30 14:54:09 2010 +0200
@@ -0,0 +1,11 @@
+CREATE TABLE tbl_bug2575 (
+"documentid" BIGINTNOT NULL,
+"seq"SMALLINT NOT NULL,
+"trigram"CHAR(3) NOT NULL
+);
+
+copy 2 records into tbl_bug2575 from stdin using delimiters '\t','\n','';
+100011629 .v.
+100016900010 coÃ
+
+DROP TABLE tbl_bug2575;
diff -r eb65fd02d465 -r 0c493ed52585
sql/src/test/BugTracker-2010/Tests/incomplete-utf8-sequence.Bug-2575.stable.err
--- /dev/null Thu Jan 01 00:00:00 1970 +
+++
b/sql/src/test/BugTracker-2010/Tests/incomplete-utf8-sequence.Bug-2575.stable.err
Mon Aug 30 14:54:09 2010 +0200
@@ -0,0 +1,80 @@
+stderr of test 'incomplete-utf8-sequence.Bug-2575` in directory
'src/test/BugTracker-2010` itself:
+
+
+# 14:47:28 >
+# 14:47:28 > mserver5 "--config=/ufs/sjoerd/Monet-stable/etc/monetdb5.conf"
--debug=10 --set gdk_nr_threads=0 --set
"monet_mod_path=/ufs/sjoerd/Monet-stable/lib64/MonetDB5:/ufs/sjoerd/Monet-stable/lib64/MonetDB5/lib:/ufs/sjoerd/Monet-stable/lib64/MonetDB5/bin"
--set "gdk_dbfarm=/ufs/sjoerd/Monet-stable/var/MonetDB5/dbfarm" --set
mapi_open=true --set xrpc_open=true --set mapi_port=36476 --set xrpc_port=40665
--set monet_prompt= --set mal_listing=2 --trace
"--dbname=mTests_src_test_BugTracker-2010" --set mal_listing=0 ; echo ; echo
Over..
+# 14:47:28 >
+
+# builtin opt gdk_arch = 64bitx86_64-unknown-linux-gnu
+# builtin opt gdk_version = 1.38.4
+# builtin opt prefix = /ufs/sjoerd/Monet-stable
+# builtin opt exec_prefix = ${prefix}
+# builtin opt gdk_dbname = demo
+# builtin opt gdk_dbfarm = ${prefix}/var/MonetDB/dbfarm
+# builtin opt gdk_debug = 0
+# builtin opt gdk_alloc_map = no
+# builtin opt gdk_vmtrim = yes
+# builtin opt monet_admin = adm
+# builtin opt monet_prompt = >
+# builtin opt monet_welcome = yes
+# builtin opt monet_mod_path = ${prefix}/lib64/MonetDB
+# builtin opt monet_daemon = no
+# builtin opt host = localhost
+# builtin opt mapi_port = 5
+# builtin opt mapi_clients = 2
+# builtin opt mapi_open = false
+# builtin opt mapi_autosense = false
+# builtin opt sql_debug = 0
+# builtin opt standoff_ns =
+# builtin opt standoff_start = start
+# builtin opt standoff_end = end
+# config opt prefix = /ufs/sjoerd/Monet-stable
+# config opt config = ${prefix}/etc/monetdb5.conf
+# config opt prefix = /ufs/sjoerd/Monet-stable
+# config opt exec_prefix = ${prefix}
+# config opt gdk_dbfarm = ${prefix}/var/MonetDB5/dbfarm
+# config opt monet_mod_path =
${prefix}/lib64/MonetDB5:${prefix}/lib64/MonetDB5/lib:${prefix}/lib64/MonetDB5/bin
+# config opt mero_pidfile = ${prefix}/var/run/MonetDB/merovingian.pid
+# config opt mero_controlport = 50001
+# config opt sql_optimizer = default_pipe
+# config opt minimal_pipe = inline,remap,deadcode,multiplex,garbageCollector
+# config opt default_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mitosis,mergetable,deadcode,commonTerms,joinPath,reorder,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# config opt nov2009_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# config opt accumulator_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,accumulators,dataflow,history,multiplex,garbageCollector
+# config opt recycler_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,deadcode,constants,commonTerms,joinPath,deadcode,recycle,reduce,dataflow,history,multiplex,garbageCollector
+# config opt cracker_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,selcrack,deadcode,constants,commonTerms,joinPath,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# config opt sidcrack_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,sidcrack,deadcode,cons
MonetDB: default - Merge with Jun2010 branch.
Changeset: eb65fd02d465 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=eb65fd02d465
Modified Files:
MonetDB5/src/modules/mal/tablet_sql.mx
Branch: default
Log Message:
Merge with Jun2010 branch.
diffs (38 lines):
diff -r 4a8a7f464e53 -r eb65fd02d465 MonetDB5/ChangeLog.Jun2010
--- a/MonetDB5/ChangeLog.Jun2010Mon Aug 30 11:47:11 2010 +0200
+++ b/MonetDB5/ChangeLog.Jun2010Mon Aug 30 14:41:28 2010 +0200
@@ -1,3 +1,8 @@
# ChangeLog file for MonetDB5
# This file is updated with Maddlog
+* Mon Aug 30 2010 Sjoerd Mullender
+- 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 4a8a7f464e53 -r eb65fd02d465 MonetDB5/src/modules/mal/tablet_sql.mx
--- a/MonetDB5/src/modules/mal/tablet_sql.mxMon Aug 30 11:47:11 2010 +0200
+++ b/MonetDB5/src/modules/mal/tablet_sql.mxMon Aug 30 14:41:28 2010 +0200
@@ -166,12 +166,16 @@
char *val;
val = *s ? GDKstrdup(s) : GDKstrdup("");
if ( *err == NULL){
- snprintf(buf, BUFSIZ, "value '%.*s%s' from line "
BUNFMT
-" field %d not inserted, expecting
type %s\n",
-BUFSIZ - 200, val,
-strlen(val) > (size_t) BUFSIZ - 200 ?
"..." : "",
-BATcount(fmt->c[0])+1,
-col, fmt->type);
+ if (snprintf(buf, BUFSIZ, "value '%.*s%s' from line "
BUNFMT
+" field %d not inserted,
expecting type %s\n",
+BUFSIZ - 200, val,
+strlen(val) > (size_t) BUFSIZ
- 200 ? "..." : "",
+BATcount(fmt->c[0])+1,
+col, fmt->type) < 0)
+ snprintf(buf, BUFSIZ, "value from line " BUNFMT
+" field %d not inserted,
expecting type %s\n",
+BATcount(fmt->c[0])+1,
+col, fmt->type);
*err= GDKstrdup(buf);
}
GDKfree(val);
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merge with Jun2010 branch.
Changeset: 4a8a7f464e53 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4a8a7f464e53 Modified Files: Branch: default Log Message: Merge with Jun2010 branch. diffs (12 lines): diff -r 80e68b747391 -r 4a8a7f464e53 sql/ChangeLog-Archive --- a/sql/ChangeLog-Archive Mon Aug 30 11:46:29 2010 +0200 +++ b/sql/ChangeLog-Archive Mon Aug 30 11:47:11 2010 +0200 @@ -3,7 +3,7 @@ * Fri Aug 20 2010 Sjoerd Mullender - 2.38.5-20100823 - Fixed a case where the optimizer incorrectly removed an expression. - This fixes bu 2602. + This fixes bug 2602. - Fix a crash in prepared statements when a parameter is on the left-hand side of a binary operator. This fixes bug 2599. - Fixed reporting of a violated foreign key constraint. This fixes ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - merge with Jun2010; omitted changes to preven...
Changeset: def2fad0888d for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=def2fad0888d Modified Files: pathfinder/compiler/Tests/usageH.stable.out Branch: default Log Message: merge with Jun2010; omitted changes to prevent propagation ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merge with Jun2010 branch.
Changeset: 720299d37a72 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=720299d37a72
Modified Files:
MonetDB/MonetDB.spec
MonetDB4/MonetDB-server.spec
MonetDB5/MonetDB-server.spec
buildtools/conf/MonetDB.m4
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/MonetDB-SQL.spec
sql/NT/MonetDB5-SQL/MonetDB5-SQL-Installer.vdproj
sql/NT/MonetDB5-SQL64/MonetDB5-SQL-Installer.vdproj
testing/MonetDB-testing.spec
Branch: default
Log Message:
Merge with Jun2010 branch.
diffs (298 lines):
diff -r e3a7325c15e4 -r 720299d37a72 .hgtags
--- a/.hgtags Tue Aug 24 09:28:58 2010 +0200
+++ b/.hgtags Tue Aug 24 10:40:44 2010 +0200
@@ -422,3 +422,5 @@
9aa479df22dda265b8c685f9e15b0899244b0184 Jun2010_3
a6dd584e5bee4d0ec428e6aade193c263c55cdb3 Jun2010_3
19ede2d368c6cba18d6b67cd8bde9d51af2ac9f8 Jun2010_5
+19ede2d368c6cba18d6b67cd8bde9d51af2ac9f8 Jun2010_5
+931928c216bc600a35580fa19f73daac66bd3571 Jun2010_5
diff -r e3a7325c15e4 -r 720299d37a72 MonetDB/MonetDB.spec
--- a/MonetDB/MonetDB.spec Tue Aug 24 09:28:58 2010 +0200
+++ b/MonetDB/MonetDB.spec Tue Aug 24 10:40:44 2010 +0200
@@ -106,6 +106,9 @@
%{_libdir}/libbat.so
%changelog
+* Tue Aug 24 2010 Sjoerd Mullender - 1.38.5-20100824
+- Rebuilt.
+
* Mon Aug 23 2010 Sjoerd Mullender - 1.38.5-20100823
- Rebuilt.
diff -r e3a7325c15e4 -r 720299d37a72 MonetDB/debian/changelog
--- a/MonetDB/debian/changelog Tue Aug 24 09:28:58 2010 +0200
+++ b/MonetDB/debian/changelog Tue Aug 24 10:40:44 2010 +0200
@@ -1,3 +1,9 @@
+monetdb (1.38.5-20100824) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender Tue, 24 Aug 2010 09:30:18 +0200
+
monetdb (1.38.5-20100823) unstable; urgency=low
* Rebuilt.
diff -r e3a7325c15e4 -r 720299d37a72 MonetDB4/ChangeLog-Archive
--- a/MonetDB4/ChangeLog-ArchiveTue Aug 24 09:28:58 2010 +0200
+++ b/MonetDB4/ChangeLog-ArchiveTue Aug 24 10:40:44 2010 +0200
@@ -1,6 +1,10 @@
# DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
# This file contains past ChangeLog entries
+* Tue Aug 24 2010 Sjoerd Mullender - 4.38.5-20100824
+- Fixed a crash when calculating certain aggregates on platforms where
+ non-aligned data access is not allowed (e.g. Sparc).
+
* Thu Jul 22 2010 Sjoerd Mullender - 4.38.5-20100823
- Slight change to Fedora, Debian, Ubuntu installers: the database
directory now has the group setuid bit set so that new databases
diff -r e3a7325c15e4 -r 720299d37a72 MonetDB4/ChangeLog.Jun2010
--- a/MonetDB4/ChangeLog.Jun2010Tue Aug 24 09:28:58 2010 +0200
+++ b/MonetDB4/ChangeLog.Jun2010Tue Aug 24 10:40:44 2010 +0200
@@ -1,7 +1,3 @@
# ChangeLog file for MonetDB4
# This file is updated with Maddlog
-* Tue Aug 24 2010 Sjoerd Mullender
-- Fixed a crash when calculating certain aggregates on platforms where
- non-aligned data access is not allowed (e.g. Sparc).
-
diff -r e3a7325c15e4 -r 720299d37a72 MonetDB4/MonetDB-server.spec
--- a/MonetDB4/MonetDB-server.spec Tue Aug 24 09:28:58 2010 +0200
+++ b/MonetDB4/MonetDB-server.spec Tue Aug 24 10:40:44 2010 +0200
@@ -217,6 +217,13 @@
%{_libdir}/libembeddedmil.so
%changelog
+* Tue Aug 24 2010 Sjoerd Mullender - 4.38.5-20100824
+- Rebuilt.
+
+* Tue Aug 24 2010 Sjoerd Mullender - 4.38.5-20100824
+- Fixed a crash when calculating certain aggregates on platforms where
+ non-aligned data access is not allowed (e.g. Sparc).
+
* Mon Aug 23 2010 Sjoerd Mullender - 4.38.5-20100823
- Rebuilt.
diff -r e3a7325c15e4 -r 720299d37a72 MonetDB4/debian/changelog
--- a/MonetDB4/debian/changelog Tue Aug 24 09:28:58 2010 +0200
+++ b/MonetDB4/debian/changelog Tue Aug 24 10:40:44 2010 +0200
@@ -1,3 +1,16 @@
+monetdb4-server (4.38.5-20100824) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender Tue, 24 Aug 2010 09:30:18 +0200
+
+monetdb4-server (4.38.5-20100824) unstable; urgency=low
+
+ * Fixed a crash when calculating certain aggregates on platforms where
+non-aligned data access is not allowed (e.g. Sparc).
+
+ -- Sjoerd Mullender Tue, 24 Aug 2010 09:30:18 +0200
+
monetdb4-server (4.38.5-20100823) unstable; urgency=low
* Rebuilt.
diff -r e3a7325c15e4 -r 720299d37a72 MonetDB5/ChangeLog-Archive
--- a/MonetDB5/ChangeLog-ArchiveTue Aug 24 09:28:58 2010 +0200
+++ b/MonetDB5/ChangeLog-ArchiveTue Aug 24 10:40:44 2010 +0200
@@ -1,6 +1,10 @@
# DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
# This file contains past ChangeLog entries
MonetDB: default - Merge with Jun2010 branch.
Changeset: e13b7117093b for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e13b7117093b
Modified Files:
MonetDB/MonetDB.spec
MonetDB4/MonetDB-server.spec
MonetDB5/MonetDB-server.spec
buildtools/conf/MonetDB.m4
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 (truncated from 1228 to 300 lines):
diff -r fec324448e55 -r e13b7117093b .hgtags
--- a/.hgtags Mon Aug 23 09:48:20 2010 +0200
+++ b/.hgtags Mon Aug 23 10:41:27 2010 +0200
@@ -421,3 +421,4 @@
9aa479df22dda265b8c685f9e15b0899244b0184 Jun2010_3
9aa479df22dda265b8c685f9e15b0899244b0184 Jun2010_3
a6dd584e5bee4d0ec428e6aade193c263c55cdb3 Jun2010_3
+19ede2d368c6cba18d6b67cd8bde9d51af2ac9f8 Jun2010_5
diff -r fec324448e55 -r e13b7117093b MonetDB/ChangeLog-Archive
--- a/MonetDB/ChangeLog-Archive Mon Aug 23 09:48:20 2010 +0200
+++ b/MonetDB/ChangeLog-Archive Mon Aug 23 10:41:27 2010 +0200
@@ -1,6 +1,11 @@
# DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
# This file contains past ChangeLog entries
+* Fri Aug 20 2010 Sjoerd Mullender - 1.38.5-20100823
+- Fixed a bug where some internal reference counting was done incorrectly,
+ causing an infinite loop when exiting the server due to it being killed.
+ This bug probably only manifested itself in MonetDB/XQuery. Bug 2658.
+
* Mon May 31 2010 Sjoerd Mullender - 1.38.1-20100618
- Updated Vendor information.
diff -r fec324448e55 -r e13b7117093b MonetDB/ChangeLog.Jun2010
--- a/MonetDB/ChangeLog.Jun2010 Mon Aug 23 09:48:20 2010 +0200
+++ b/MonetDB/ChangeLog.Jun2010 Mon Aug 23 10:41:27 2010 +0200
@@ -1,8 +1,3 @@
# ChangeLog file for MonetDB
# This file is updated with Maddlog
-* Fri Aug 20 2010 Sjoerd Mullender
-- Fixed a bug where some internal reference counting was done incorrectly,
- causing an infinite loop when exiting the server due to it being killed.
- This bug probably only manifested itself in MonetDB/XQuery. Bug 2658.
-
diff -r fec324448e55 -r e13b7117093b MonetDB/MonetDB.spec
--- a/MonetDB/MonetDB.spec Mon Aug 23 09:48:20 2010 +0200
+++ b/MonetDB/MonetDB.spec Mon Aug 23 10:41:27 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-SP1/%{name}-%{version}.tar.gz
+Source:
http://dev.monetdb.org/downloads/sources/Jun2010-SP2/%{name}-%{version}.tar.gz
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XX)
BuildRequires: zlib-devel, bzip2-devel, openssl-devel
@@ -106,6 +106,14 @@
%{_libdir}/libbat.so
%changelog
+* Mon Aug 23 2010 Sjoerd Mullender - 1.38.5-20100823
+- Rebuilt.
+
+* Fri Aug 20 2010 Sjoerd Mullender - 1.38.5-20100823
+- Fixed a bug where some internal reference counting was done incorrectly,
+ causing an infinite loop when exiting the server due to it being killed.
+ This bug probably only manifested itself in MonetDB/XQuery. Bug 2658.
+
* Tue Jul 13 2010 Sjoerd Mullender - 1.38.3-20100713
- Rebuilt.
diff -r fec324448e55 -r e13b7117093b MonetDB/debian/changelog
--- a/MonetDB/debian/changelog Mon Aug 23 09:48:20 2010 +0200
+++ b/MonetDB/debian/changelog Mon Aug 23 10:41:27 2010 +0200
@@ -1,3 +1,17 @@
+monetdb (1.38.5-20100823) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender Mon, 23 Aug 2010 10:13:12 +0200
+
+monetdb (1.38.5-20100823) unstable; urgency=low
+
+ * Fixed a bug where some internal reference counting was done incorrectly,
+causing an infinite loop when exiting the server due to it being killed.
+This bug probably only manifested itself in MonetDB/XQuery. Bug 2658.
+
+ -- Sjoerd Mullender Fri, 20 Aug 2010 10:13:11 +0200
+
monetdb (1.38.3-20100713) unstable; urgency=low
* Rebuilt.
diff -r fec324448e55 -r e13b7117093b MonetDB4/ChangeLog-Archive
--- a/MonetDB4/ChangeLog-ArchiveMon Aug 23 09:48:20 2010 +0200
+++ b/MonetDB4/ChangeLog-ArchiveMon Aug 23 10:41:27 2010 +0200
@@ -1,6 +1,11 @@
# DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
# This file contains past ChangeLog entries
+* Thu Jul 22 2010 Sjoerd Mullender - 4.38.5-20100823
+- Slight change to Fedora, Debian, Ubuntu installers: the database
+ directory now has the group setuid bit set so that new databases
+ inherit the group ownership (monetdb).
+
* Mon May 31 2010 Sjoerd Mullender - 4.38.1-20100618
- Updated Vendor information.
diff -r fec324448e55 -r e13b7117093b MonetDB4/ChangeLog.Jun2010
--- a/MonetDB4/ChangeLog.Jun2010Mon Aug 23 09:48:20 2010 +0200
+++ b/MonetDB4/ChangeLog.Jun2010Mon Aug 23 10:41:27 2010 +0200
@@ -1,8 +1,3 @@
# ChangeLog file for MonetDB4
# This file is updated with Maddlog
-* Thu Jul 22 2010 Sjoerd Mullender
-- Slight change to
MonetDB: default - Merge with Jun2010 branch.
Changeset: 134cdc4cc0c4 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=134cdc4cc0c4 Modified Files: Branch: default Log Message: Merge with Jun2010 branch. diffs (truncated from 506 to 300 lines): diff -r 7ce79e5e8afe -r 134cdc4cc0c4 sql/src/test/BugTracker-2010/Tests/crash-with-huge-query.Bug-2647.sql --- /dev/null Thu Jan 01 00:00:00 1970 + +++ b/sql/src/test/BugTracker-2010/Tests/crash-with-huge-query.Bug-2647.sql Fri Aug 20 17:04:56 2010 +0200 @@ -0,0 +1,492 @@ +-- +-- Table structure for table payments +-- + +CREATE TABLE payments ( + id integer, + order_id integer default NULL, + created_at timestamp default NULL, + updated_at timestamp default NULL, + amount decimal(8,2) NOT NULL default '0.00', + creditcard_id integer default NULL, + paytype varchar(255) default NULL +); + +-- +-- Table structure for table addresses +-- + +CREATE TABLE addresses ( + id integer, + firstname varchar(255) default NULL, + lastname varchar(255) default NULL, + address1 varchar(255) default NULL, + address2 varchar(255) default NULL, + city varchar(255) default NULL, + state_id integer default NULL, + zipcode varchar(255) default NULL, + country_id integer default NULL, + phone varchar(255) default NULL, + created_at timestamp default NULL, + updated_at timestamp default NULL, + state_name varchar(255) default NULL +); + +-- +-- Table structure for table countries +-- + +CREATE TABLE countries ( + id integer, + iso_name varchar(255) default NULL, + iso varchar(255) default NULL, + name varchar(255) default NULL, + iso3 varchar(255) default NULL, + numcode integer default NULL +); + +-- +-- Table structure for table line_items +-- + +CREATE TABLE line_items ( + id integer, + order_id integer default NULL, + variant_id integer default NULL, + quantity integer NOT NULL, + price decimal(8,2) NOT NULL, + created_at timestamp default NULL, + updated_at timestamp default NULL +); + +-- +-- Table structure for table orders +-- + +CREATE TABLE orders ( + id integer default NULL, + user_id integer default NULL, + number varchar(255) default NULL, + ship_amount decimal(8,2) NOT NULL default '0.00', + tax_amount decimal(8,2) NOT NULL default '0.00', + item_total decimal(8,2) NOT NULL default '0.00', + total decimal(8,2) NOT NULL default '0.00', + ip_address varchar(255) default NULL, + special_instructions text, + created_at timestamp default NULL, + updated_at timestamp default NULL, + state varchar(255) default NULL, + checkout_complete integer default NULL, + token varchar(255) default NULL, + email varchar(255) default NULL, + bill_address_id integer default NULL, + ship_address_id integer default NULL +); + +-- +-- Table structure for table products +-- + +CREATE TABLE products ( + id integer default NULL, + name varchar(255) NOT NULL default '', + description text, + master_price decimal(8,2) default NULL, + created_at timestamp default NULL, + updated_at timestamp default NULL, + permalink varchar(255) default NULL, + available_on timestamp default NULL, + tax_category_id integer default NULL, + shipping_category integer default NULL, + deleted_at timestamp default NULL, + meta_description varchar(255) default NULL, + meta_keywords varchar(255) default NULL +); + +-- +-- Table structure for table schema_migrations +-- + +CREATE TABLE schema_migrations ( + version varchar(255) NOT NULL +); + +-- +-- Table structure for table shipments +-- + +CREATE TABLE shipments ( + id integer, + order_id integer default NULL, + shipping_method_id integer default NULL, + tracking varchar(255) default NULL, + created_at timestamp default NULL, + updated_at timestamp default NULL, + number varchar(255) default NULL, + cost decimal(8,2) default NULL, + shipped_at timestamp default NULL, + address_id integer default NULL +); + +-- +-- Table structure for table shipping_methods +-- + +CREATE TABLE shipping_methods ( + id integer, + zone_id integer default NULL, + shipping_calculator varchar(255) default NULL, + name varchar(255) default NULL, + created_at timestamp default NULL, + updated_at timestamp default NULL +); + +-- +-- Table structure for table states +-- + +CREATE TABLE states ( + id integer, + name varchar(255) default NULL, + abbr varchar(255) default NULL, + country_id integer default NULL +); + +-- +-- Table structure for table tax_categories +-- + +CREATE TABLE tax_categories ( + id integer, + name varchar(255) default NULL, + description varchar(255) default NULL, + created_at timestamp default NULL, + updated_at timestamp default NULL +); + +-- +-- Table structure for table tax_rates +-- + +CREATE TABLE tax_rates ( + id integer default NULL, + zone_id integer default NULL, + amount decimal(8,4) default NULL, + created_at timestamp default NULL, + updated_at timestamp default NULL, + tax_type integer default NULL, + tax_category_id integer default NULL +); + +-- +-- Table structure for tab
MonetDB: default - Merge with Jun2010 branch.
Changeset: 7ce79e5e8afe for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7ce79e5e8afe Modified Files: java/ChangeLog.Aug2009 java/ChangeLog.Feb2010 java/ChangeLog.Nov2009 sql/src/backends/monet5/merovingian/ChangeLog.Aug2009 sql/src/backends/monet5/merovingian/ChangeLog.Feb2010 sql/src/backends/monet5/merovingian/ChangeLog.Nov2009 Branch: default Log Message: Merge with Jun2010 branch. diffs (truncated from 1483 to 300 lines): diff -r e782d77127be -r 7ce79e5e8afe MonetDB/ChangeLog-Archive --- /dev/null Thu Jan 01 00:00:00 1970 + +++ b/MonetDB/ChangeLog-Archive Fri Aug 20 15:12:21 2010 +0200 @@ -0,0 +1,78 @@ +# DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY +# This file contains past ChangeLog entries + +* Mon May 31 2010 Sjoerd Mullender - 1.38.1-20100618 +- Updated Vendor information. + +* Tue Apr 20 2010 Stefan Manegold - 1.38.1-20100618 +- Made compilation of "testing" (and "java") independent of MonetDB. + This is mainly for Windows, but also on other systems, "testing" can + now be built independently of (and hence before) "MonetDB". Files + that mimic configure functionality on Windows were moved from + "MonetDB" to "buildtools"; hence, this affects all packages on + Windows, requiring a complete rebuild from scratch on Windows. + getopt() support in testing has changed; hence, (most probably) + requiring a rebuild from scratch of testing on other systems. + +* Tue Apr 20 2010 Stefan Manegold - 1.38.1-20100618 +- Implemented build directory support for Windows, i.e., like on + Unix/Linux also on Windows we can now build in a separate build + directory as alternative to ...\\NT, and thus keep the latter + clean from files generated during the build. On Windows, the build + directory must be a sibling of ...\\NT . + +* Thu Apr 15 2010 Sjoerd Mullender - 1.36.5-20100420 +- Fixed a bug that could cause a crash when string BATs are combined. + (SF bug 2947763.) + +* Sun Apr 11 2010 Niels Nes - 1.36.5-20100420 +- Fixed a potential file leak: under certain conditions, files in the + database might not get deleted when they should (they would be + deleted when the server restarts). + +* Mon Mar 29 2010 Fabian Groffen - 1.36.5-20100420 +- Fix regression introduced in Feb2010-SP1 causing UDP connections to + malfunction, in particular affecting the stethoscope tool. + +* Mon Mar 01 2010 Fabian Groffen - 1.36.3-20100322 +- Fixed bug in UDP stream creation causing UDP connections to already + bound ports to be reported as successful. + +* Mon Feb 22 2010 Sjoerd Mullender - 1.36.1-20100223 +- Various concurrency bugs were fixed. +- Various changes were made to run better on systems that don't have + enough memory to keep everything in core that was touched during + query processing. This is done by having the higher layers giving + hints to the database kernel about future use, and the database + kernel giving hings to the operating system kernel about how + (virtual) memory is going to be used. + +* Thu Feb 18 2010 Stefan Manegold - 1.36.1-20100223 +- Fixed bug in mergejoin implementation. This fixes bug #2952191. + +* Tue Feb 2 2010 Sjoerd Mullender - 1.36.1-20100223 +- Added support for compiling on Windows using the Cygwin-provided + version of flex. + +* Thu Jan 21 2010 Sjoerd Mullender - 1.36.1-20100223 +- Fix compilation issue when configured with --with-curl. This fixes + bug #2924999. + +* Thu Jan 21 2010 Fabian Groffen - 1.36.1-20100223 +- Added implementation of MT_getrss() for Solaris. This yields in the + kernel knowing about its (approximate) memory usage to try and help + the operating system to free that memory that is best to free, + instead of a random page, e.g. the work of the vmtrim thread. + +* Wed Jan 20 2010 Sjoerd Mullender - 1.36.1-20100223 +- Implemented a "fast" string BAT append: Under certain conditions, + instead of inserting values one-by-one, we now concatenate the + string heap wholesale and just manipulate the offsets. This works + both for BATins and BATappend. + +* Wed Jan 6 2010 Sjoerd Mullender - 1.36.1-20100223 +- Changed the string heap implementation to also contain the hashes of + strings. +- Changed the implementation of the string offset columns to be + dynamically sized. + diff -r e782d77127be -r 7ce79e5e8afe MonetDB4/ChangeLog-Archive --- /dev/null Thu Jan 01 00:00:00 1970 + +++ b/MonetDB4/ChangeLog-ArchiveFri Aug 20 15:12:21 2010 +0200 @@ -0,0 +1,23 @@ +# DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY +# This file contains past ChangeLog entries + +* Mon May 31 2010 Sjoerd Mullender - 4.38.1-20100618 +- Updated Vendor information. + +* Tue Apr 20 2010 Stefan Manegold - 4.38.1-20100618 +- Made compilation of "testing" (and "java") independent of MonetDB. + This is mainly for Windows, but also on other systems, "testing" can + now be built independently of (and hence before) "MonetDB". Files + that mimic configu
MonetDB: default - Merge with Jun2010 branch.
Changeset: dbdb607487e1 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=dbdb607487e1 Modified Files: Branch: default Log Message: Merge with Jun2010 branch. diffs (12 lines): diff -r 78725207a0c8 -r dbdb607487e1 sql/src/test/BugTracker-2010/Tests/copy-into-too-long-string.Bug-2358.stable.err --- a/sql/src/test/BugTracker-2010/Tests/copy-into-too-long-string.Bug-2358.stable.err Fri Aug 20 12:49:36 2010 +0200 +++ b/sql/src/test/BugTracker-2010/Tests/copy-into-too-long-string.Bug-2358.stable.err Fri Aug 20 13:16:30 2010 +0200 @@ -75,7 +75,7 @@ QUERY = COPY 1 RECORDS INTO t FROM STDIN USING DELIMITERS '|',' ','"' NULL AS '';"abcd" -ERROR = !SQLException:importTable:value 'abcd' from line 1 field 1 not inserted, expecting type str +ERROR = !SQLException:importTable:value 'abcd' from line 1 field 1 not inserted, value too long for type (var)char(3) !failed to import table # 15:34:26 > ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - merge with Jun2010 branch
Changeset: fa4a6f5a4666 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fa4a6f5a4666
Modified Files:
Branch: default
Log Message:
merge with Jun2010 branch
diffs (10 lines):
diff -r 81c33e1c5e34 -r fa4a6f5a4666
sql/src/test/BugTracker-2008/Tests/insert-null-byte.SF-2233581.SQL.py
--- a/sql/src/test/BugTracker-2008/Tests/insert-null-byte.SF-2233581.SQL.py
Thu Aug 19 22:13:03 2010 +0200
+++ b/sql/src/test/BugTracker-2008/Tests/insert-null-byte.SF-2233581.SQL.py
Fri Aug 20 08:46:58 2010 +0200
@@ -6,3 +6,6 @@
os.path.pardir,
'insert-null-byte.sql')))
c.communicate()
+
+c = process.client('sql', stdin = process.PIPE)
+c.communicate('drop table strings2233581;')
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - merge with Jun2010 branch
Changeset: 81c33e1c5e34 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=81c33e1c5e34 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/MonetDB-SQL.spec sql/src/server/rel_select.mx sql/src/test/BugTracker-2010/Tests/All testing/MonetDB-testing.spec Branch: default Log Message: merge with Jun2010 branch diffs (truncated from 451 to 300 lines): diff -r 453efd75f1a2 -r 81c33e1c5e34 MonetDB/MonetDB.spec --- a/MonetDB/MonetDB.spec Thu Aug 19 18:05:43 2010 +0200 +++ b/MonetDB/MonetDB.spec Thu Aug 19 22:13:03 2010 +0200 @@ -143,9 +143,9 @@ * Tue Apr 20 2010 Stefan Manegold - 1.38.1-20100618 - Implemented build directory support for Windows, i.e., like on Unix/Linux also on Windows we can now build in a separate build - directory as alternative to ...NT, and thus keep the latter + directory as alternative to ...\\NT, and thus keep the latter clean from files generated during the build. On Windows, the build - directory must be a sibling of ...NT . + directory must be a sibling of ...\\NT . * Tue Apr 20 2010 Sjoerd Mullender - 1.36.5-20100420 - Rebuilt. diff -r 453efd75f1a2 -r 81c33e1c5e34 MonetDB/debian/changelog --- a/MonetDB/debian/changelog Thu Aug 19 18:05:43 2010 +0200 +++ b/MonetDB/debian/changelog Thu Aug 19 22:13:03 2010 +0200 @@ -63,9 +63,9 @@ * Implemented build directory support for Windows, i.e., like on Unix/Linux also on Windows we can now build in a separate build -directory as alternative to ...NT, and thus keep the +directory as alternative to ...\\NT, and thus keep the latter clean from files generated during the build. On Windows, -the build directory must be a sibling of ...NT . +the build directory must be a sibling of ...\\NT . -- Stefan Manegold Tue, 20 Apr 2010 10:58:37 +0200 diff -r 453efd75f1a2 -r 81c33e1c5e34 MonetDB4/MonetDB-server.spec --- a/MonetDB4/MonetDB-server.spec Thu Aug 19 18:05:43 2010 +0200 +++ b/MonetDB4/MonetDB-server.spec Thu Aug 19 22:13:03 2010 +0200 @@ -254,9 +254,9 @@ * Tue Apr 20 2010 Stefan Manegold - 4.38.1-20100618 - Implemented build directory support for Windows, i.e., like on Unix/Linux also on Windows we can now build in a separate build - directory as alternative to ...NT, and thus keep the latter + directory as alternative to ...\\NT, and thus keep the latter clean from files generated during the build. On Windows, the build - directory must be a sibling of ...NT . + directory must be a sibling of ...\\NT . * Tue Apr 20 2010 Sjoerd Mullender - 4.36.5-20100420 - Rebuilt. diff -r 453efd75f1a2 -r 81c33e1c5e34 MonetDB4/debian/changelog --- a/MonetDB4/debian/changelog Thu Aug 19 18:05:43 2010 +0200 +++ b/MonetDB4/debian/changelog Thu Aug 19 22:13:03 2010 +0200 @@ -63,9 +63,9 @@ * Implemented build directory support for Windows, i.e., like on Unix/Linux also on Windows we can now build in a separate build -directory as alternative to ...NT, and thus keep the +directory as alternative to ...\\NT, and thus keep the latter clean from files generated during the build. On Windows, -the build directory must be a sibling of ...NT . +the build directory must be a sibling of ...\\NT . -- Stefan Manegold Tue, 20 Apr 2010 10:58:37 +0200 diff -r 453efd75f1a2 -r 81c33e1c5e34 MonetDB5/MonetDB-server.spec --- a/MonetDB5/MonetDB-server.spec Thu Aug 19 18:05:43 2010 +0200 +++ b/MonetDB5/MonetDB-server.spec Thu Aug 19 22:13:03 2010 +0200 @@ -288,9 +288,9 @@ * Tue Apr 20 2010 Stefan Manegold - 5.20.1-20100618 - Implemented build directory support for Windows, i.e., like on Unix/Linux also on Windows we can now build in a separate build - directory as alternative to ...NT, and thus keep the latter + directory as alternative to ...\\NT, and thus keep the latter clean from files generated during the build. On Windows, the build - directory must be a sibling of ...NT . + directory must be a sibling of ...\\NT . * Tue Apr 20 2010 Martin Kersten - 5.20.1-20100618 - The MAL debugger list command has been extended with an optional diff -r 453efd75f1a2 -r 81c33e1c5e34 MonetDB5/debian/changelog --- a/MonetDB5/debian/changelog Thu Aug 19 18:05:43 2010 +0200 +++ b/MonetDB5/debian/changelog Thu Aug 19 22:13:03 2010 +0200 @@ -122,9 +122,9 @@ * Implemented build directory support for Windows, i.e., like on Unix/Linux also on Windows we can now build in a separate build -directory as alternative to ...NT, and thus keep the +directory as alternative to ...\\NT, and thus keep the latter clean from files generated during the build. On Windows, -the build directory must be a sibling of ...NT . +the build directory must be a sibling of ...\\NT . -- Stefan Manegold Tue,
MonetDB: default - Merge with Jun2010 branch.
Changeset: 83b10c04d473 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=83b10c04d473
Modified Files:
MonetDB/src/gdk/gdk_bbp.mx
Branch: default
Log Message:
Merge with Jun2010 branch.
diffs (12 lines):
diff -r f61f6ab3acbb -r 83b10c04d473 MonetDB/src/gdk/gdk_bbp.mx
--- a/MonetDB/src/gdk/gdk_bbp.mxThu Aug 19 12:38:44 2010 +0200
+++ b/MonetDB/src/gdk/gdk_bbp.mxThu Aug 19 14:44:59 2010 +0200
@@ -2308,7 +2308,7 @@
BBPdestroy(BAT *b)
{
int clear = 1;
- bat hp = VIEWhparent(b), tp = VIEWtparent(b);
+ bat hp = b->H->heap.parentid, tp = b->T->heap.parentid;
bat vhp = VIEWvhparent(b), vtp = VIEWvtparent(b);
if (isVIEW(b)) {/* a physical view */
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merge with Jun2010 branch.
Changeset: a23de431529b for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a23de431529b Modified Files: Branch: default Log Message: Merge with Jun2010 branch. diffs (46 lines): diff -r 3ca8f0ffca39 -r a23de431529b sql/src/test/BugTracker-2009/Tests/AVG_of_SQRT.SF-2757642.test.reqtests --- /dev/null Thu Jan 01 00:00:00 1970 + +++ b/sql/src/test/BugTracker-2009/Tests/AVG_of_SQRT.SF-2757642.test.reqtests Thu Aug 19 10:07:52 2010 +0200 @@ -0,0 +1,1 @@ +AVG_of_SQRT.SF-2757642.unpack_csv diff -r 3ca8f0ffca39 -r a23de431529b sql/src/test/BugTracker-2009/Tests/AVG_of_SQRT.SF-2757642.test.stable.out --- a/sql/src/test/BugTracker-2009/Tests/AVG_of_SQRT.SF-2757642.test.stable.out Thu Aug 19 10:07:20 2010 +0200 +++ b/sql/src/test/BugTracker-2009/Tests/AVG_of_SQRT.SF-2757642.test.stable.out Thu Aug 19 10:07:52 2010 +0200 @@ -30,7 +30,8 @@ % L1, L2, single_value, L3, single_value, L4 # name % char,wrd,char, double, char, double # type % 22, 9, 15, 22, 20, 22 # length -[ "count(n8) == 1",1, "avg(n8) == 1.21", 1.20998,"avg(sqrt(n8)) == 1.1", 1.09998 ] +[ "count(n8) == 1",1, "avg(n8) == 1.21", 1.21001,"avg(sqrt(n8)) == 1.1", 1.09998 ] +#select 'avg(sqrt(n8)) == 1.1', avg(sqrt(a)) from n8; % .L11,sys. # table_name % L11, L12 # name % char,double # type diff -r 3ca8f0ffca39 -r a23de431529b sql/src/test/BugTracker-2009/Tests/All --- a/sql/src/test/BugTracker-2009/Tests/AllThu Aug 19 10:07:20 2010 +0200 +++ b/sql/src/test/BugTracker-2009/Tests/AllThu Aug 19 10:07:52 2010 +0200 @@ -48,13 +48,13 @@ TribooleanFailureWithSubquery.SF-2679434 nullstr.SF-2704016 POWER_vs_prod.SF-2596114 -#parallel_bulk-load.SF-2771052.unpack_csv -#parallel_bulk-load.SF-2771052.test -#parallel_bulk-load.SF-2771052.clean +parallel_bulk-load.SF-2771052.unpack_csv +parallel_bulk-load.SF-2771052.test +parallel_bulk-load.SF-2771052.clean wrong_error_message.SF-2637051 -#AVG_of_SQRT.SF-2757642.unpack_csv -#AVG_of_SQRT.SF-2757642.test -#AVG_of_SQRT.SF-2757642.clean +AVG_of_SQRT.SF-2757642.unpack_csv +AVG_of_SQRT.SF-2757642.test +AVG_of_SQRT.SF-2757642.clean missing_column_name.SF-2776100 dumping_tables.SF-2776908 dumping_tables.SF-2776908--performance diff -r 3ca8f0ffca39 -r a23de431529b sql/src/test/BugTracker-2009/Tests/parallel_bulk-load.SF-2771052.test.reqtests --- /dev/null Thu Jan 01 00:00:00 1970 + +++ b/sql/src/test/BugTracker-2009/Tests/parallel_bulk-load.SF-2771052.test.reqtests Thu Aug 19 10:07:52 2010 +0200 @@ -0,0 +1,1 @@ +parallel_bulk-load.SF-2771052.unpack_csv ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merge with Jun2010 branch.
Changeset: 3ca8f0ffca39 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3ca8f0ffca39
Modified Files:
clients/src/mapiclient/mclient.mx
Branch: default
Log Message:
Merge with Jun2010 branch.
diffs (124 lines):
diff -r b355aba116d3 -r 3ca8f0ffca39 clients/ChangeLog.Jun2010
--- a/clients/ChangeLog.Jun2010 Wed Aug 18 21:36:05 2010 +0200
+++ b/clients/ChangeLog.Jun2010 Thu Aug 19 10:07:20 2010 +0200
@@ -1,9 +1,16 @@
# ChangeLog file for clients
# This file is updated with Maddlog
+* Thu Aug 19 2010 Sjoerd Mullender
+- mclient now complains about NULL bytes in the input when in interactive
+ mode.
+
* Fri Aug 13 2010 Fabian Groffen
-- Slight rendering improvements to mclient's tabular output when rendering
results larger than the available screen width, headers were previously
unnecessarily squeezed.
-- Fix bug #2650, a too small buffer caused the active database as reported by
mclient's welcome message to be truncated
+- Slight rendering improvements to mclient's tabular output when
+ rendering results larger than the available screen width, headers
+ were previously unnecessarily squeezed.
+- Fix bug #2650, a too small buffer caused the active database as
+ reported by mclient's welcome message to be truncated
* Wed Jul 21 2010 Fabian Groffen
- Add --version option to mclient.
diff -r b355aba116d3 -r 3ca8f0ffca39 clients/src/mapiclient/mclient.mx
--- a/clients/src/mapiclient/mclient.mx Wed Aug 18 21:36:05 2010 +0200
+++ b/clients/src/mapiclient/mclient.mx Thu Aug 19 10:07:20 2010 +0200
@@ -1801,7 +1801,7 @@
MapiHdl hdl = mapi_get_active(mid);
MapiMsg rc = MOK;
int sent = 0; /* whether we sent any data to the server */
- int first = 1; /* first line processing */
+ int lineno = 1;
#ifdef HAVE_LIBREADLINE
if (prompt == NULL)
@@ -1809,6 +1809,10 @@
oldbuf = buf = malloc(BUFSIZ);
do {
+ if (prompt) {
+ /* clear errors when interactive */
+ errseen = 0;
+ }
mnstr_flush(toConsole);
timerPause();
#ifdef HAVE_LIBREADLINE
@@ -1837,6 +1841,8 @@
} else
#endif
{
+ int c = 0;
+
#ifndef HAVE_LIBREADLINE
if (prompt) {
fputs(hdl ? "more>" : prompt, stdout);
@@ -1846,11 +1852,35 @@
if (buf != oldbuf)
free(buf);
buf = oldbuf;
- line = fgets(buf, BUFSIZ, fp);
- }
- if (prompt) {
- /* clear errors when interactive */
- errseen = 0;
+ line = buf;
+ while (line < buf + BUFSIZ - 1 &&
+ (c = getc(fp)) != EOF) {
+ if (c == 0) {
+ fprintf(stderr, "NULL byte in input on
line %d of input\n", lineno);
+ /* read away rest of line */
+ while ((c = getc(fp)) != EOF &&
+ c != '\n')
+ ;
+ errseen = 1;
+ c = 0x1234; /* indicate error */
+ if (hdl) {
+ mapi_close_handle(hdl);
+ hdl = NULL;
+ }
+ break;
+ }
+ *line++ = c;
+ if (c == '\n')
+ break;
+ }
+ if (c == 0x1234)
+ continue;
+ if (line == buf)
+ line = NULL;
+ else {
+ *line = 0;
+ line = buf;
+ }
}
#ifdef HAVE_ICONV
if (line != NULL && encoding != NULL && cd_in != (iconv_t) -1) {
@@ -1871,10 +1901,10 @@
#ifdef HAVE_ICONV
encoding == NULL &&
#endif
- first &&
+ lineno == 1 &&
strncmp(line, UTF8BOM, UTF8BOMLENGTH) == 0)
line += UTF8BOMLENGTH; /* skip Byte Order Mark (BOM) */
- first = 0;
+ lineno++;
if (line == NULL ||
(mode == XQUERY && line[0] == '<' && line[1] == '>')) {
/* end of file */
diff -r b355aba116d3 -r 3ca8f0ffca39
sql/src/test/BugTracker-2008/Tests/insert-null-byte.SF
MonetDB: default - merge with Jun2010 branch
Changeset: a370bd77e0e6 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a370bd77e0e6 Modified Files: Branch: default Log Message: merge with Jun2010 branch diffs (46 lines): diff -r b355aba116d3 -r a370bd77e0e6 sql/src/test/BugTracker-2009/Tests/AVG_of_SQRT.SF-2757642.test.reqtests --- /dev/null Thu Jan 01 00:00:00 1970 + +++ b/sql/src/test/BugTracker-2009/Tests/AVG_of_SQRT.SF-2757642.test.reqtests Thu Aug 19 09:33:15 2010 +0200 @@ -0,0 +1,1 @@ +AVG_of_SQRT.SF-2757642.unpack_csv diff -r b355aba116d3 -r a370bd77e0e6 sql/src/test/BugTracker-2009/Tests/AVG_of_SQRT.SF-2757642.test.stable.out --- a/sql/src/test/BugTracker-2009/Tests/AVG_of_SQRT.SF-2757642.test.stable.out Wed Aug 18 21:36:05 2010 +0200 +++ b/sql/src/test/BugTracker-2009/Tests/AVG_of_SQRT.SF-2757642.test.stable.out Thu Aug 19 09:33:15 2010 +0200 @@ -30,7 +30,8 @@ % L1, L2, single_value, L3, single_value, L4 # name % char,wrd,char, double, char, double # type % 22, 9, 15, 22, 20, 22 # length -[ "count(n8) == 1",1, "avg(n8) == 1.21", 1.20998,"avg(sqrt(n8)) == 1.1", 1.09998 ] +[ "count(n8) == 1",1, "avg(n8) == 1.21", 1.21001,"avg(sqrt(n8)) == 1.1", 1.09998 ] +#select 'avg(sqrt(n8)) == 1.1', avg(sqrt(a)) from n8; % .L11,sys. # table_name % L11, L12 # name % char,double # type diff -r b355aba116d3 -r a370bd77e0e6 sql/src/test/BugTracker-2009/Tests/All --- a/sql/src/test/BugTracker-2009/Tests/AllWed Aug 18 21:36:05 2010 +0200 +++ b/sql/src/test/BugTracker-2009/Tests/AllThu Aug 19 09:33:15 2010 +0200 @@ -48,13 +48,13 @@ TribooleanFailureWithSubquery.SF-2679434 nullstr.SF-2704016 POWER_vs_prod.SF-2596114 -#parallel_bulk-load.SF-2771052.unpack_csv -#parallel_bulk-load.SF-2771052.test -#parallel_bulk-load.SF-2771052.clean +parallel_bulk-load.SF-2771052.unpack_csv +parallel_bulk-load.SF-2771052.test +parallel_bulk-load.SF-2771052.clean wrong_error_message.SF-2637051 -#AVG_of_SQRT.SF-2757642.unpack_csv -#AVG_of_SQRT.SF-2757642.test -#AVG_of_SQRT.SF-2757642.clean +AVG_of_SQRT.SF-2757642.unpack_csv +AVG_of_SQRT.SF-2757642.test +AVG_of_SQRT.SF-2757642.clean missing_column_name.SF-2776100 dumping_tables.SF-2776908 dumping_tables.SF-2776908--performance diff -r b355aba116d3 -r a370bd77e0e6 sql/src/test/BugTracker-2009/Tests/parallel_bulk-load.SF-2771052.test.reqtests --- /dev/null Thu Jan 01 00:00:00 1970 + +++ b/sql/src/test/BugTracker-2009/Tests/parallel_bulk-load.SF-2771052.test.reqtests Thu Aug 19 09:33:15 2010 +0200 @@ -0,0 +1,1 @@ +parallel_bulk-load.SF-2771052.unpack_csv ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - merge with Jun2010 branch
Changeset: 70aa06ebe04e for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=70aa06ebe04e Modified Files: Branch: default Log Message: merge with Jun2010 branch diffs (17 lines): diff -r fab42ddc4495 -r 70aa06ebe04e testing/src/process.py --- a/testing/src/process.pyWed Aug 18 16:12:41 2010 +0200 +++ b/testing/src/process.pyWed Aug 18 18:42:36 2010 +0200 @@ -91,7 +91,12 @@ ret.append(c) if size > 0: size -= 1 -self._queue.task_done() +try: +# only available as of Python 2.5 +self._queue.task_done() +except AttributeError: +# not essential, if not available +pass if not c: self._eof = True break # EOF ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - merge with Jun2010 branch
Changeset: 80f5e079528a for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=80f5e079528a Modified Files: Branch: default Log Message: merge with Jun2010 branch diffs (111 lines): diff -r f3eb0723df0c -r 80f5e079528a MonetDB5/src/modules/mal/pqueue.mx --- a/MonetDB5/src/modules/mal/pqueue.mxWed Aug 18 11:10:17 2010 +0200 +++ b/MonetDB5/src/modules/mal/pqueue.mxWed Aug 18 13:34:04 2010 +0200 @@ -315,7 +315,7 @@ BUN i, n = BATcount(t); oid idx = t->hseqbase; - if ((BUN) *N < n) + if (*N != wrd_nil && *N >= 0 && *N <= (wrd) BUN_MAX && (BUN) *N < n) n = (BUN) *N; if (do_pqueue_init(H,t,n) == GDK_FAIL) return GDK_FAIL; @@ -337,7 +337,7 @@ BUN i, n = BATcount(t); BUN p = BUNfirst(t); - if ((BUN) *N < n) + if (*N != wrd_nil && *N >= 0 && *N <= (wrd) BUN_MAX && (BUN) *N < n) n = (BUN) *N; if (do_pqueue_init(H,t,n) == GDK_FAIL) return GDK_FAIL; @@ -362,7 +362,9 @@ BUN i, j, n, cnt = BATcount(t), p; oid idx = t->hseqbase; - n = (BUN) *N; + n = cnt; + if (*N != wrd_nil && *N >= 0 && *N <= (wrd) BUN_MAX) + n = (BUN) *N; if (do_pqueue_init(H,t,n) == GDK_FAIL) return GDK_FAIL; duplicates = BATnew(TYPE_oid, TYPE_oid, n); @@ -410,7 +412,9 @@ BUN i, j, n, cnt = BATcount(t), p; oid *idx; - n = (BUN) *N; + n = cnt; + if (*N != wrd_nil && *N >= 0 && *N <= (wrd) BUN_MAX) + n = (BUN) *N; if (do_pqueue_init(H,t,n) == GDK_FAIL) return GDK_FAIL; duplicates = BATnew(TYPE_oid, TYPE_oid, n); @@ -596,7 +600,7 @@ BUN p = BUNfirst(t); int tpe = BATttype(t); - if ((BUN) *N < n) + if (*N != wrd_nil && *N >= 0 && *N <= (wrd) BUN_MAX && (BUN) *N < n) n = (BUN) *N; if (do_pqueue_init(H,t,n) == GDK_FAIL) return GDK_FAIL; @@ -618,7 +622,7 @@ BUN p = BUNfirst(t); int tpe = BATttype(t); - if ((BUN) *N < n) + if (*N != wrd_nil && *N >= 0 && *N <= (wrd) BUN_MAX && (BUN) *N < n) n = (BUN) *N; if (do_pqueue_init(H,t,n) == GDK_FAIL) return GDK_FAIL; @@ -643,7 +647,9 @@ oid idx = t->hseqbase; int tpe = BATttype(t); - n = (BUN) *N; + n = cnt; + if (*N != wrd_nil && *N >= 0 && *N <= (wrd) BUN_MAX) + n = (BUN) *N; if (do_pqueue_init(H,t,n) == GDK_FAIL) return GDK_FAIL; duplicates = BATnew(TYPE_oid, TYPE_oid, n); @@ -695,7 +701,9 @@ ptr v; int tpe = BATttype(t); - n = (BUN) *N; + n = cnt; + if (*N != wrd_nil && *N >= 0 && *N <= (wrd) BUN_MAX) + n = (BUN) *N; if (do_pqueue_init(H,t,n) == GDK_FAIL) return GDK_FAIL; duplicates = BATnew(TYPE_oid, TYPE_oid, n); diff -r f3eb0723df0c -r 80f5e079528a sql/src/test/BugTracker-2009/Tests/recursion-problem.SF-2827784.timeout --- /dev/null Thu Jan 01 00:00:00 1970 + +++ b/sql/src/test/BugTracker-2009/Tests/recursion-problem.SF-2827784.timeout Wed Aug 18 13:34:04 2010 +0200 @@ -0,0 +1,1 @@ +4 diff -r f3eb0723df0c -r 80f5e079528a sql/src/test/Skyserver/Tests/Skyserver.timeout --- a/sql/src/test/Skyserver/Tests/Skyserver.timeoutWed Aug 18 11:10:17 2010 +0200 +++ b/sql/src/test/Skyserver/Tests/Skyserver.timeoutWed Aug 18 13:34:04 2010 +0200 @@ -1,1 +1,1 @@ -2 +3 diff -r f3eb0723df0c -r 80f5e079528a sql/src/test/Skyserver/Tests/Skyserver_v6.timeout --- a/sql/src/test/Skyserver/Tests/Skyserver_v6.timeout Wed Aug 18 11:10:17 2010 +0200 +++ b/sql/src/test/Skyserver/Tests/Skyserver_v6.timeout Wed Aug 18 13:34:04 2010 +0200 @@ -1,1 +1,1 @@ -2 +3 diff -r f3eb0723df0c -r 80f5e079528a sql/src/test/VOC/Tests/VOC.timeout --- /dev/null Thu Jan 01 00:00:00 1970 + +++ b/sql/src/test/VOC/Tests/VOC.timeoutWed Aug 18 13:34:04 2010 +0200 @@ -0,0 +1,1 @@ +2 diff -r f3eb0723df0c -r 80f5e079528a sql/src/test/xquery/Tests/create.timeout --- a/sql/src/test/xquery/Tests/create.timeout Wed Aug 18 11:10:17 2010 +0200 +++ b/sql/src/test/xquery/Tests/create.timeout Wed Aug 18 13:34:04 2010 +0200 @@ -1,1 +1,1 @@ -3 +10 ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merge with Jun2010 branch.
Changeset: e3e0cbbf067a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e3e0cbbf067a
Modified Files:
MonetDB5/src/modules/mal/tablet_sql.mx
MonetDB5/src/optimizer/opt_mergetable.mx
Branch: default
Log Message:
Merge with Jun2010 branch.
diffs (truncated from 337 to 300 lines):
diff -r d36c48c97c35 -r e3e0cbbf067a MonetDB5/src/modules/mal/tablet_sql.mx
--- a/MonetDB5/src/modules/mal/tablet_sql.mxTue Aug 17 15:16:43 2010 +0200
+++ b/MonetDB5/src/modules/mal/tablet_sql.mxTue Aug 17 23:42:13 2010 +0200
@@ -29,7 +29,7 @@
that should preferable be maintained.
The code below consists of a file reader, which breaks up the
-file into chunks of distinct lines. Then multiple parallel threads
+file into chunks of distinct lines. Then multiple parallel threads
grab them, and break them on the field boundaries.
After all fields are identified this way, the columns are converted
and stored in the BATs.
@@ -39,7 +39,7 @@
to distributed cheap and expensive columns over threads.
The file reader overlaps IO with updates of the BAT.
-Also the buffer size of the block stream might be a little small for
+Also the buffer size of the block stream might be a little small for
this task (1MB). It has been increased to 8MB, which indeed improved.
The work divider allocates subtasks to threads based on the
@@ -67,7 +67,7 @@
int next;
int limit;
lng *time, wtime; /* time per col + time per thread */
- int rounds; /* how often did we divide the work */
+ int rounds; /* how often did we divide the work */
MT_Id tid;
MT_Sema producer; /* reader waits for call */
MT_Sema consumer; /* data available */
@@ -89,7 +89,7 @@
@-
The line is broken into pieces directly on their field separators. It assumes
that we have
-the record in the cache already, so we can do most work quickly.
+the record in the cache already, so we can do most work quickly.
Furthermore, it assume a uniform (SQL) pattern, without whitespace skipping,
but with quote and separator.
@c
@@ -122,7 +122,7 @@
@-
The parsing of the individual values is straightforward. If the value
represents
-the null-replacement string then we grab the underlying nil.
+the null-replacement string then we grab the underlying nil.
If the string starts with the quote identified from SQL, we locate the tail
and interpret the body.
@c
@@ -144,14 +144,14 @@
} else
if ( quote && *s == quote ) {
/* strip the quotes when present */
- s++;
+ s++;
for ( t = e = s; *t ; t++)
if ( *t == quote) e = t;
*e = 0;
adt = fmt->frstr(fmt, fmt->adt, s, e, 0);
/* The user might have specified a null string escape
e.g. NULL as '', which should be tested */
- if (adt == NULL && s == e && fmt->nullstr &&
+ if (adt == NULL && s == e && fmt->nullstr &&
strncasecmp(s, fmt->nullstr, fmt->null_length+1) == 0){
adt = fmt->nildata;
fmt->c[0]->T->nonil = 0;
@@ -274,8 +274,8 @@
GDKerror(errmsg);
GDKfree(errline);
goto errors;
- }
- }
+ }
+ }
/* eat away the column separator */
for ( ; *line ; line++)
@@ -292,7 +292,7 @@
}
/* not enough fields */
if ( i < as->nr_attrs-1) {
- snprintf(errmsg,BUFSIZ, "missing separator '%s' line "
BUNFMT " field " BUNFMT "\n",
+ snprintf(errmsg,BUFSIZ, "missing separator '%s' line "
BUNFMT " field " BUNFMT "\n",
fmt->sep, BATcount(fmt->c[0]) + 1 +
task->next, i);
errors:
/* we save all errors detected */
@@ -306,7 +306,7 @@
}
as->error = GDKstrdup(errmsg);
mal_unset_lock(mal_copyLock,"tablet line break");
- for (i = 0; i < as->nr_attrs ; i++)
+ for (i = 0; i < as->nr_attrs ; i++)
task->fields[i][idx] = NULL ;
break;
}
@@ -435,7 +435,7 @@
#ifdef _DEBUG_TABLET_
mnstr_printf(GDKout,"SQLloader started\n");
#endif
- while( task->ateof == 0)
+ while( task->ateof == 0)
{
MT_down_sema(task->producer, "tablet loader");
#ifdef _DEBUG_TABLET_
@@ -461,7 +461,10 @@
READERtask ptask[16];
int threads= (!maxrow || maxrow > (1<<16)) ? (GDKnr_threads < 16?
GDKnr_threads: 16):1;
lng lio =0, tio, t1 = 0, total=0, iototal=0;
- int v
MonetDB: default - Merge with Jun2010 branch.
Changeset: d36c48c97c35 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d36c48c97c35
Modified Files:
MonetDB5/src/optimizer/opt_mergetable.mx
MonetDB5/src/optimizer/opt_prelude.mx
MonetDB5/src/optimizer/opt_support.mx
sql/src/test/BugTracker-2008/Tests/insert-null-byte.SF-2233581.SQL.bat
sql/src/test/BugTracker-2008/Tests/insert-null-byte.SF-2233581.SQL.sh
sql/src/test/BugTracker-2009/Tests/dumping_tables.SF-2776908.SQL.bat
sql/src/test/BugTracker-2009/Tests/dumping_tables.SF-2776908.SQL.sh
sql/src/test/BugTracker-2010/alter-table-restart-crash.SF-2975018/Tests/alter-table-restart-crash.SF-2975018-1.sql
sql/src/test/BugTracker-2010/alter-table-restart-crash.SF-2975018/Tests/alter-table-restart-crash.SF-2975018-1.stable.err
sql/src/test/BugTracker-2010/alter-table-restart-crash.SF-2975018/Tests/alter-table-restart-crash.SF-2975018-1.stable.out
sql/src/test/BugTracker-2010/alter-table-restart-crash.SF-2975018/Tests/alter-table-restart-crash.SF-2975018-2.sql
sql/src/test/BugTracker-2010/alter-table-restart-crash.SF-2975018/Tests/alter-table-restart-crash.SF-2975018-2.stable.err
sql/src/test/BugTracker-2010/alter-table-restart-crash.SF-2975018/Tests/alter-table-restart-crash.SF-2975018-2.stable.out
sql/src/test/BugTracker-2010/alter-table-restart-crash.SF-2975022/Tests/alter-table-restart-crash.SF-2975022-1.sql
sql/src/test/BugTracker-2010/alter-table-restart-crash.SF-2975022/Tests/alter-table-restart-crash.SF-2975022-1.stable.err
sql/src/test/BugTracker-2010/alter-table-restart-crash.SF-2975022/Tests/alter-table-restart-crash.SF-2975022-1.stable.out
sql/src/test/BugTracker-2010/alter-table-restart-crash.SF-2975022/Tests/alter-table-restart-crash.SF-2975022-2.sql
sql/src/test/BugTracker-2010/alter-table-restart-crash.SF-2975022/Tests/alter-table-restart-crash.SF-2975022-2.stable.err
sql/src/test/BugTracker-2010/alter-table-restart-crash.SF-2975022/Tests/alter-table-restart-crash.SF-2975022-2.stable.out
sql/src/test/Tests/like_tests.SQL.bat
sql/src/test/Tests/like_tests.SQL.sh
sql/src/test/Tests/null-byte-hang.SQL.bat
sql/src/test/Tests/null-byte-hang.SQL.sh
sql/src/test/Tests/zones2.SQL.bat
sql/src/test/Tests/zones2.SQL.sh
Branch: default
Log Message:
Merge with Jun2010 branch.
diffs (truncated from 1630 to 300 lines):
diff -r ef962eacc773 -r d36c48c97c35 MonetDB5/src/optimizer/opt_mergetable.mx
--- a/MonetDB5/src/optimizer/opt_mergetable.mx Tue Aug 17 12:22:41 2010 +0200
+++ b/MonetDB5/src/optimizer/opt_mergetable.mx Tue Aug 17 15:16:43 2010 +0200
@@ -771,7 +771,6 @@
return mtop;
}
-
/* join, also handles the case that mat[m].mm is set, ie that we
have the extend available.
*/
@@ -1618,7 +1617,11 @@
@c
/* only handle simple joins, ie not range/band joins */
- if (match > 0 && match <= 2 && isMatJoinOp(p)) {
+ /* For range/band joins (argc == 4), the propagation of oids
+ is different, ie result-head equals head-1st arg,
+ result-tail equals head-2nd/3rd arg */
+
+ if (match > 0 && match <= 2 && isMatJoinOp(p) && p->argc == 3) {
m = isMATalias(getArg(p,1), mat, mtop);
n = isMATalias(getArg(p,2), mat, mtop);
if ((m = mat_join(mb, p, mat, mtop, m, n)) < 0)
@@ -1742,9 +1745,16 @@
getModuleId(p) == aggrRef ||
(getModuleId(p) == algebraRef &&
(getFunctionId(p) == sortTailRef ||
-getFunctionId(p) == sortReverseTailRef {
+getFunctionId(p) == sortReverseTailRef)) ||
+ (getModuleId(p) == pqueueRef &&
+ (getFunctionId(p) == topn_minRef ||
+getFunctionId(p) == topn_maxRef {
error++;
goto fail;
+ /* For order (and order related topn)
+ we need a similar 2 phase model as used for group
+ by
+*/
}
@-
The slice operation can also be piggy backed onto the mat.pack using it
diff -r ef962eacc773 -r d36c48c97c35 MonetDB5/src/optimizer/opt_prelude.mx
--- a/MonetDB5/src/optimizer/opt_prelude.mx Tue Aug 17 12:22:41 2010 +0200
+++ b/MonetDB5/src/optimizer/opt_prelude.mx Tue Aug 17 15:16:43 2010 +0200
@@ -129,7 +129,7 @@
opt_export str newRef;
opt_export str oidRef;
opt_export str octopusRef;
-opt_export str openRef;
+opt_export str openRef;
opt_export str optimizerRef;
opt_export str packRef;
opt_export str pack2Ref;
@@ -142,6 +142,7 @@
opt_export str preludeRef;
opt_export str prodRef;
opt_export str pos
MonetDB: default - Merge with Jun2010 branch.
Changeset: 6acbf14b23fa for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6acbf14b23fa
Modified Files:
MonetDB/src/gdk/gdk_bbp.mx
sql/src/test/Skyserver/Tests/Skyserver.SQL.py
Branch: default
Log Message:
Merge with Jun2010 branch.
diffs (270 lines):
diff -r 2a0d92bb79cd -r 6acbf14b23fa MonetDB/src/gdk/gdk_bbp.mx
--- a/MonetDB/src/gdk/gdk_bbp.mxMon Aug 16 15:23:38 2010 +0200
+++ b/MonetDB/src/gdk/gdk_bbp.mxMon Aug 16 17:53:58 2010 +0200
@@ -153,16 +153,16 @@
#include "gdk_storage.h"
@}
@-
-The BBP has now a fixed address, so re-allocation due to a growing BBP
+The BBP has a fixed address, so re-allocation due to a growing BBP
caused by one thread does not disturb reads to the old entries by another.
This is implemented using anonymous virtual memory; extensions on the same
address are guaranteed because a large non-committed VM area is requested
-initially. New slots in the BBP are found at O(1) by keeping a freelist
+initially. New slots in the BBP are found in O(1) by keeping a freelist
that uses the 'next' field in the BBPrec records.
@{
@c
BBPrec *BBP = NULL;/* fixed base VM address of BBP array */
-bat BBPmaxsize = BBPMAXSIZE; /* size of non-commited VM BBP array */
+bat BBPmaxsize = BBPMAXSIZE; /* size of non-committed VM BBP array */
bat BBPlimit = 0; /* current committed VM BBP array */
bat BBPsize = 0; /* current used size of BBP array */
@@ -478,7 +478,7 @@
recover_dir(int direxists)
{
if (direxists) {
- /* just try; don't care about these nonvital files */
+ /* just try; don't care about these non-vital files */
GDKunlink(BATDIR, "BBP", "bak");
GDKmove(BATDIR, "BBP", "dir", BATDIR, "BBP", "bak");
}
@@ -492,7 +492,7 @@
/* Convert the old-style string heap to the new style.
This function must be called at the end of BBPinit(), just before
"normal processing" starts. All errors that happen during the
- conversion are fatal. This function is "save" in the sense that
+ conversion are fatal. This function is "safe" in the sense that
when it is interrupted, recovery will just start over. No
permanent changes are made to the database until all string heaps
have been converted, and then the changes are made atomically.
diff -r 2a0d92bb79cd -r 6acbf14b23fa
sql/src/test/Skyserver/Tests/Skyserver.SQL.py
--- a/sql/src/test/Skyserver/Tests/Skyserver.SQL.py Mon Aug 16 15:23:38
2010 +0200
+++ b/sql/src/test/Skyserver/Tests/Skyserver.SQL.py Mon Aug 16 17:53:58
2010 +0200
@@ -6,56 +6,77 @@
passwd = 'skyserver'
dir = os.getenv('TSTSRCDIR')
sys.stdout.write('Create User\n')
-clt = process.client('sql', args = [os.path.join(dir,
'..','create_user.sql')], stdout = process.PIPE)
+sys.stderr.write('Create User\n')
+clt = process.client('sql', args = [os.path.join(dir,
'..','create_user.sql')], stdout = process.PIPE, stderr = process.PIPE)
out,err = clt.communicate()
sys.stdout.write(out)
+sys.stderr.write(err)
sys.stdout.write('tables\n')
-clt1 = process.client('sql', user = user, passwd = passwd, args =
[os.path.join(dir, '..','..','..','sql','math.sql')], stdout = process.PIPE)
+sys.stderr.write('tables\n')
+clt1 = process.client('sql', user = user, passwd = passwd, args =
[os.path.join(dir, '..','..','..','sql','math.sql')], stdout = process.PIPE,
stderr = process.PIPE)
out,err = clt1.communicate()
sys.stdout.write(out)
-clt1 = process.client('sql', user = user, passwd = passwd, args =
[os.path.join(dir, '..','..','..','sql','skyserver.sql')], stdout =
process.PIPE)
+sys.stderr.write(err)
+clt1 = process.client('sql', user = user, passwd = passwd, args =
[os.path.join(dir, '..','..','..','sql','skyserver.sql')], stdout =
process.PIPE, stderr = process.PIPE)
out,err = clt1.communicate()
sys.stdout.write(out)
-clt1 = process.client('sql', user = user, passwd = passwd, args =
[os.path.join(dir, '..','Skyserver_tables.sql')], stdout = process.PIPE)
+sys.stderr.write(err)
+clt1 = process.client('sql', user = user, passwd = passwd, args =
[os.path.join(dir, '..','Skyserver_tables.sql')], stdout = process.PIPE, stderr
= process.PIPE)
out,err = clt1.communicate()
sys.stdout.write(out)
-clt1 = process.client('sql', user = user, passwd = passwd, stdin =
process.PIPE, stdout = process.PIPE)
+sys.stderr.write(err)
+clt1 = process.client('sql', user = user, passwd = passwd, stdin =
process.PIPE, stdout = process.PIPE, stderr = process.PIPE)
sql = open(os.path.join(dir, '..',
'Skyserver_import.sql')).read().replace('DATA',os.path.join(dir,'..','microsky').replace('\\',''))
out,err = clt1.communicate(sql)
sys.stdout.write(out)
-clt1 = process.client('sql', user = user, passwd = passwd, args =
[os.path.join(dir, '..','Skyserver_constraints.s
MonetDB: default - Merge with Jun2010 branch.
Changeset: fbff9df8f94c for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fbff9df8f94c Modified Files: buildtools/doc/windowsbuild.rst Branch: default Log Message: Merge with Jun2010 branch. diffs (176 lines): diff -r aec3ac719f3d -r fbff9df8f94c buildtools/doc/windowsbuild.rst --- a/buildtools/doc/windowsbuild.rst Fri Aug 13 09:36:24 2010 +0200 +++ b/buildtools/doc/windowsbuild.rst Fri Aug 13 09:47:42 2010 +0200 @@ -24,11 +24,11 @@ In this document we describe how to build the MonetDB suite of programs on Windows using the sources from our source repository at -SourceForge__. This document is mainly targeted at building on +`our server`__. This document is mainly targeted at building on Windows XP on a 32-bit architecture, but there are notes throughout about building on Windows XP x64 which is indicated with Windows64. -__ http://sourceforge.net/projects/monetdb/ +__ http://dev.monetdb.org/hg/MonetDB/ Introduction @@ -158,8 +158,10 @@ - Microsoft Visual Studio .NET 2003 (also known as Microsoft Visual Studio 7); - Microsoft Visual Studio 2005 (also known as Microsoft Visual Studio 8); +- Microsoft Visual Studio 2008 (also known as Microsoft Visual Studio 9.0); - Intel(R) C++ Compiler 9.1 (which actually needs one of the above); -- Intel(R) C++ Compiler 10.1 (which also needs one of the Microsoft compilers). +- Intel(R) C++ Compiler 10.1 (which also needs one of the Microsoft compilers); +- Intel(R) C++ Compiler 11.1 (which also needs one of the Microsoft compilers). Note that the pathfinder component can currently not be compiled with any of the Microsoft compilers. It can be compiled with the Intel @@ -171,6 +173,9 @@ a version that uses the MinGW__ (Minimalist GNU for Windows) package. This is not supported and not further described here. +We currently use Microsoft Visual Studio 2008 and Intel(R) C++ +Compiler Professional 11.1.046. + __ http://www.cygwin.com/ __ http://www.mingw.org/ @@ -198,6 +203,10 @@ link on the left and then on Bison, and get the Setup file and install it. +However, we use the version of bison that comes with Cygwin__. + +__ http://www.cygwin.com/ + Flex @@ -207,6 +216,10 @@ at http://gnuwin32.sourceforge.net/. Click on the Packages link on the left and then on Flex, and get the Setup file and install it. +However, we use the version of bison that comes with Cygwin__. + +__ http://www.cygwin.com/ + Pthreads @@ -302,8 +315,9 @@ the clients component when it needs to talk to a MonetDB5 server. Download the source from http://www.openssl.org/. We used the latest -stable version (0.9.8k). Follow the instructions in the file -``INSTALL.W32`` or ``INSTALL.W64``. +stable version (1.0.0a). Follow the instructions in the file +``INSTALL.W32`` or ``INSTALL.W64``. We used the option +``enable-static-engine`` as described in the instructions. Fix the ``OPENSSL`` definitions in ``buildtools\conf\winrules.msc`` so that they refer to the location where you installed the library and @@ -325,19 +339,17 @@ Install these in e.g. ``C:\``. Note that we hit a bug in version 2.6.31 of libxml2. See the -bugreport__. Use version 2.6.30 or 2.6.32. +bugreport__. Use version 2.6.30 or 2.6.32 or later. On Windows64 you will have to compile libxml2 yourself (with its optional prerequisites iconv_ and zlib_, for which see below). -Edit the file ``win32\Makefile.msvc`` and change the one occurrence of -``zdll.lib`` to ``zlib1.lib``, and then run the following commands in -the ``win32`` subfolder, substituting the correct locations for the -iconv and zlib libraries:: +Run the following commands in the ``win32`` subfolder, substituting +the correct locations for the iconv and zlib libraries:: - cscript configure.js compiler=msvc prefix=C:\libxml2-2.6.30.win64 ^ - include=C:\iconv-1.11.win64\include;C:\zlib-1.2.3.win64\include ^ - lib=C:\iconv-1.11.win64\lib;C:\zlib-1.2.3.win64\lib iconv=yes zlib=yes + cscript configure.js compiler=msvc prefix=C:\libxml2-2.7.7.win64 ^ + include=C:\iconv-1.11.win64\include;C:\zlib-1.2.5.win64\include ^ + lib=C:\iconv-1.11.win64\lib;C:\zlib-1.2.5.win64\lib iconv=yes zlib=yes nmake /f Makefile.msvc nmake /f Makefile.msvc install @@ -345,7 +357,7 @@ ``lib`` folder to the ``bin`` folder. __ http://xmlsoft.org/ -__ https://sourceforge.net/tracker/index.php?func=detail&aid=1899258&group_id=56967&atid=482468 +__ http://bugs.monetdb.org/1600 geos (Geometry Engine Open Souce) - @@ -428,25 +440,24 @@ http://www.zlib.net/, but Windows binaries can be gotten from the same site as the libxml2 library: http://www.zlatkovic.com/libxml.en.html. Click on Win32 Binaries on the right, and download zlib. Install in -e.g. ``C:\``. +e.g. ``C:\``. Note that the at the time of writing, the precompiled +version lags behind: it is version 1.2.3, whereas 1.2.5 is current. On Windows64 you will have to compile zli
MonetDB: default - Merge with Jun2010 branch.
Changeset: aec3ac719f3d for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=aec3ac719f3d
Modified Files:
pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery-Installer.vdproj
pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery.vdproj
pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery64.vdproj
pathfinder/NT/MonetDB4-XQuery64/MonetDB4-XQuery-Installer.vdproj
sql/NT/MonetDB5-SQL/MonetDB5-SQL-Installer.vdproj
sql/NT/MonetDB5-SQL64/MonetDB5-SQL-Installer.vdproj
Branch: default
Log Message:
Merge with Jun2010 branch.
diffs (72 lines):
diff -r 235b741b4142 -r aec3ac719f3d
pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery-Installer.vdproj
--- a/pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery-Installer.vdprojFri Aug
13 09:29:08 2010 +0200
+++ b/pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery-Installer.vdprojFri Aug
13 09:36:24 2010 +0200
@@ -2282,7 +2282,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_778EBECF7BCE467FB89B54CB42701480"
{
-"SourcePath" =
"8:C:\\Libraries\\libxml2-2.7.7.win32\\bin\\libxml2.dll"
+"SourcePath" =
"8:C:\\Libraries\\libxml2-2.7.7.win32\\lib\\libxml2.dll"
"TargetName" = "8:libxml2.dll"
"Tag" = "8:"
"Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
diff -r 235b741b4142 -r aec3ac719f3d
pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery.vdproj
--- a/pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery.vdproj Fri Aug 13
09:29:08 2010 +0200
+++ b/pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery.vdproj Fri Aug 13
09:36:24 2010 +0200
@@ -509,7 +509,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_AF81C046F1BC492D8D2287A71D2B9980"
{
-"SourcePath" =
"8:C:\\Libraries\\libxml2-2.7.7.win32\\bin\\libxml2.dll"
+"SourcePath" =
"8:C:\\Libraries\\libxml2-2.7.7.win32\\lib\\libxml2.dll"
"TargetName" = "8:libxml2.dll"
"Tag" = "8:"
"Folder" = "8:_D262855B92DE4EC89E4AAE66EAE05B3C"
diff -r 235b741b4142 -r aec3ac719f3d
pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery64.vdproj
--- a/pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery64.vdprojFri Aug 13
09:29:08 2010 +0200
+++ b/pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery64.vdprojFri Aug 13
09:36:24 2010 +0200
@@ -509,7 +509,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_AF81C046F1BC492D8D2287A71D2B9980"
{
-"SourcePath" =
"8:C:\\Libraries\\libxml2-2.7.7.win64\\bin\\libxml2.dll"
+"SourcePath" =
"8:C:\\Libraries\\libxml2-2.7.7.win64\\lib\\libxml2.dll"
"TargetName" = "8:libxml2.dll"
"Tag" = "8:"
"Folder" = "8:_D262855B92DE4EC89E4AAE66EAE05B3C"
diff -r 235b741b4142 -r aec3ac719f3d
pathfinder/NT/MonetDB4-XQuery64/MonetDB4-XQuery-Installer.vdproj
--- a/pathfinder/NT/MonetDB4-XQuery64/MonetDB4-XQuery-Installer.vdproj Fri Aug
13 09:29:08 2010 +0200
+++ b/pathfinder/NT/MonetDB4-XQuery64/MonetDB4-XQuery-Installer.vdproj Fri Aug
13 09:36:24 2010 +0200
@@ -2730,7 +2730,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A3E18444B3684433B601D4527A23A5EA"
{
-"SourcePath" =
"8:C:\\Libraries\\libxml2-2.7.7.win64\\bin\\libxml2.dll"
+"SourcePath" =
"8:C:\\Libraries\\libxml2-2.7.7.win64\\lib\\libxml2.dll"
"TargetName" = "8:libxml2.dll"
"Tag" = "8:"
"Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
diff -r 235b741b4142 -r aec3ac719f3d
sql/NT/MonetDB5-SQL/MonetDB5-SQL-Installer.vdproj
--- a/sql/NT/MonetDB5-SQL/MonetDB5-SQL-Installer.vdproj Fri Aug 13 09:29:08
2010 +0200
+++ b/sql/NT/MonetDB5-SQL/MonetDB5-SQL-Installer.vdproj Fri Aug 13 09:36:24
2010 +0200
@@ -2091,7 +2091,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_13440C2EDE6842BF8D9F24F554EEB87F"
{
-"SourcePath" =
"8:C:\\Libraries\\libxml2-2.7.7.win32\\bin\\libxml2.dll"
+"SourcePath" =
"8:C:\\Libraries\\libxml2-2.7.7.win32\\lib\\libxml2.dll"
"TargetName" = "8:libxml2.dll"
"Tag" = "8:"
"Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
diff -r 235b741b4142 -r aec3ac719f3d
sql/NT/MonetDB5-SQL64/MonetDB5-SQL-Installer.vdproj
--- a/sql/NT/MonetDB5-SQL64/MonetDB5-SQL-Installer.vdproj Fri Aug 13
09:29:08 2010 +0200
+++ b/sql/NT/MonetDB5-SQL64/MonetDB5-SQL-Installer.vdproj Fri Aug 13
09:36:24 2010 +0200
@@ -5251,7 +5251,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_B5DCC5B713D04F9EBAA9FC44A1DA2482"
{
-"SourcePath" =
"8:C:\\Libraries\\libxml2-2.7.7.win64\\bin\\libxml2.dll"
+"SourcePath" =
"8:C:\\Libraries\\libxml2-2.7.7.win64\\lib\\libxml2.dll"
"TargetName" = "8:libxml2.dll"
"Tag" = "8:"
"Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
MonetDB: default - Merge with Jun2010 branch.
Changeset: 235b741b4142 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=235b741b4142
Modified Files:
MonetDB/NT/MonetDB-Common/MonetDB-Common.vdproj
MonetDB/NT/MonetDB-Common/MonetDB-Common64.vdproj
clients/src/odbc/winsetup/MonetDB-ODBC-Installer/MonetDB-ODBC-Installer.vdproj
clients/src/odbc/winsetup/MonetDB-ODBC-Installer64/MonetDB-ODBC-Installer.vdproj
geom/NT/MonetDB5-Geom/MonetDB5-Geom-Module.vdproj
geom/NT/MonetDB5-Geom64/MonetDB5-Geom-Module.vdproj
pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery-Installer.vdproj
pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery.vdproj
pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery64.vdproj
pathfinder/NT/MonetDB4-XQuery64/MonetDB4-XQuery-Installer.vdproj
sql/NT/MonetDB5-SQL/MonetDB5-SQL-Installer.vdproj
sql/NT/MonetDB5-SQL64/MonetDB5-SQL-Installer.vdproj
Branch: default
Log Message:
Merge with Jun2010 branch.
diffs (truncated from 645 to 300 lines):
diff -r 48e9b1665879 -r 235b741b4142
MonetDB/NT/MonetDB-Common/MonetDB-Common.vdproj
--- a/MonetDB/NT/MonetDB-Common/MonetDB-Common.vdproj Fri Aug 13 09:27:01
2010 +0200
+++ b/MonetDB/NT/MonetDB-Common/MonetDB-Common.vdproj Fri Aug 13 09:29:08
2010 +0200
@@ -187,7 +187,7 @@
{
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_0F567DEF0CA64069BF1409C4AC7228E3"
{
-"SourcePath" = "8:C:\\bzip2-1.0.5.win32\\bin\\libbz2.dll"
+"SourcePath" =
"8:C:\\Libraries\\bzip2-1.0.5.win32\\bin\\libbz2.dll"
"TargetName" = "8:libbz2.dll"
"Tag" = "8:"
"Folder" = "8:_AC71646495814C55B03F69019B5070C2"
@@ -227,7 +227,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_29FE781523A94CBDA5CD53F7A319B4D8"
{
-"SourcePath" = "8:C:\\openssl-0.9.8k.win32\\bin\\ssleay32.dll"
+"SourcePath" =
"8:C:\\Libraries\\openssl-1.0.0a.win32\\bin\\ssleay32.dll"
"TargetName" = "8:ssleay32.dll"
"Tag" = "8:"
"Folder" = "8:_AC71646495814C55B03F69019B5070C2"
@@ -267,7 +267,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_61B2E04FDCD84F34A63853B93B1DCD7B"
{
-"SourcePath" = "8:C:\\zlib-1.2.3.win32\\bin\\zlib1.dll"
+"SourcePath" = "8:C:\\Libraries\\zlib-1.2.5.win32\\bin\\zlib1.dll"
"TargetName" = "8:zlib1.dll"
"Tag" = "8:"
"Folder" = "8:_AC71646495814C55B03F69019B5070C2"
@@ -287,7 +287,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_926BCA1A727C4F29B3DA99D425D895EA"
{
-"SourcePath" = "8:C:\\openssl-0.9.8k.win32\\bin\\libeay32.dll"
+"SourcePath" =
"8:C:\\Libraries\\openssl-1.0.0a.win32\\bin\\libeay32.dll"
"TargetName" = "8:libeay32.dll"
"Tag" = "8:"
"Folder" = "8:_AC71646495814C55B03F69019B5070C2"
@@ -447,7 +447,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_DE40D199E1B2498F84A1EB70CBD21614"
{
-"SourcePath" = "8:C:\\iconv-1.11.1.win32\\bin\\iconv.dll"
+"SourcePath" =
"8:C:\\Libraries\\iconv-1.11.1.win32\\bin\\iconv.dll"
"TargetName" = "8:iconv.dll"
"Tag" = "8:"
"Folder" = "8:_AC71646495814C55B03F69019B5070C2"
diff -r 48e9b1665879 -r 235b741b4142
MonetDB/NT/MonetDB-Common/MonetDB-Common64.vdproj
--- a/MonetDB/NT/MonetDB-Common/MonetDB-Common64.vdproj Fri Aug 13 09:27:01
2010 +0200
+++ b/MonetDB/NT/MonetDB-Common/MonetDB-Common64.vdproj Fri Aug 13 09:29:08
2010 +0200
@@ -207,7 +207,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_43E49CA0EC774DEF94E2596DAC7364FB"
{
-"SourcePath" = "8:C:\\openssl-0.9.8k.win64\\bin\\libeay32.dll"
+"SourcePath" =
"8:C:\\Libraries\\openssl-1.0.0a.win64\\bin\\libeay32.dll"
"TargetName" = "8:libeay32.dll"
"Tag" = "8:"
"Folder" = "8:_AC71646495814C55B03F69019B5070C2"
@@ -247,7 +247,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_61B2E04FDCD84F34A63853B93B1DCD7B"
{
-"SourcePath" = "8:C:\\zlib-1.2.3.win64\\bin\\zlib1.dll"
+"SourcePath" = "8:C:\\Libraries\\zlib-1.2.5.win64\\bin\\zlib1.dll"
"TargetName" = "8:zlib1.dll"
"Tag" = "8:"
"Folder" = "8:_AC71646495814C55B03F69019B5070C2"
@@ -267,7 +267,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_61BDF3C1EF57820D9544098DD817"
{
-"SourcePath" = "8:C:\\openssl-0.9.8k.win64\\bin\\ssleay32.dll"
+"SourcePath" =
"8:C:\\Libraries\\openssl-1.0.0a.win64\\bin\\ssleay32.dll"
"TargetName" = "8:ssleay32.dll"
"Tag" = "8:"
"Folder" = "8:_AC71646495814C55B03F69019B5070C2"
@@ -407,7 +407,7 @@
MonetDB: default - Merge with Jun2010 branch.
Changeset: 48e9b1665879 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=48e9b1665879
Modified Files:
sql/ChangeLog.Jun2010
sql/src/server/rel_optimizer.mx
sql/src/server/rel_select.mx
sql/src/test/BugTracker-2010/Tests/All
Branch: default
Log Message:
Merge with Jun2010 branch.
diffs (truncated from 678 to 300 lines):
diff -r 45c1f030e31d -r 48e9b1665879 sql/ChangeLog.Jun2010
--- a/sql/ChangeLog.Jun2010 Thu Aug 12 22:43:43 2010 +0200
+++ b/sql/ChangeLog.Jun2010 Fri Aug 13 09:27:01 2010 +0200
@@ -1,7 +1,14 @@
# ChangeLog file for sql
# This file is updated with Maddlog
+* Fri Aug 13 2010 Niels Nes
+- Fixed bug 2643 added more defensive code, when an aggregation function
+ doesn't exist
+- Fixed bug 2651 properly handle dead code elimination with
+ op_semi/op_anti and references
+
* Thu Aug 12 2010 Niels Nes
+- Fixed bug 2652. Correctly list all columns of a 'IN' query with 'EXCEPT'
- Fixed bug 2353. The relational optimizer didn't handle range join
expressions properly.
- fixed bug 2354. Improved function resolution.
diff -r 45c1f030e31d -r 48e9b1665879 sql/src/server/rel_optimizer.mx
--- a/sql/src/server/rel_optimizer.mx Thu Aug 12 22:43:43 2010 +0200
+++ b/sql/src/server/rel_optimizer.mx Fri Aug 13 09:27:01 2010 +0200
@@ -3004,13 +3004,15 @@
static void
rel_used(sql_rel *rel)
{
- if (is_join(rel->op) || is_set(rel->op)) {
+ if (is_join(rel->op) || is_set(rel->op) || is_semi(rel->op)) {
if (rel->l)
rel_used(rel->l);
if (rel->r)
rel_used(rel->r);
- } else if (is_topn(rel->op) || is_select(rel->op))
+ } else if (is_topn(rel->op) || is_select(rel->op)) {
+ rel_used(rel->l);
rel = rel->l;
+ }
if (rel->exps) {
exps_used(rel->exps);
if (rel->r && (rel->op == op_project || rel->op == op_groupby))
diff -r 45c1f030e31d -r 48e9b1665879 sql/src/server/rel_select.mx
--- a/sql/src/server/rel_select.mx Thu Aug 12 22:43:43 2010 +0200
+++ b/sql/src/server/rel_select.mx Fri Aug 13 09:27:01 2010 +0200
@@ -2732,7 +2732,6 @@
list_destroy(vals);
}
r = rel_lastexp(sql, right);
- rel_setsubquery(right);
rel = rel_crossproduct(left, right, op_join);
if (rel_convert_types(sql, &l, &r, 1, type_equal) < 0) {
exp_destroy(l);
@@ -3494,9 +3493,12 @@
return exp_fix_scale(sql, t, exp, 1,
(t->type->scale == SCALE_FIX));
} else {
- char *type = exp_subtype(e)->type->sqlname;
-
- exp_destroy(e);
+ char *type = "unknown";
+
+ if (e) {
+ type = exp_subtype(e)->type->sqlname;
+ exp_destroy(e);
+ }
return sql_error(sql, 02, "%s: no such operator '%s(%s)'",
toUpperCopy(alloca(strlen(aggrstr) + 1), aggrstr), aggrstr, type);
}
}
diff -r 45c1f030e31d -r 48e9b1665879 sql/src/test/BugTracker-2010/Tests/All
--- a/sql/src/test/BugTracker-2010/Tests/AllThu Aug 12 22:43:43 2010 +0200
+++ b/sql/src/test/BugTracker-2010/Tests/AllFri Aug 13 09:27:01 2010 +0200
@@ -47,3 +47,6 @@
assert_on_type_mismatch.Bug-2319
crash_on_in_1.Bug-2352
crash_on_complex_join_exp.Bug-2353
+crash_in_dce.Bug-2651
+in_query_missing_columns.Bug-2652
+sum_on_date_crash.Bug-2643
diff -r 45c1f030e31d -r 48e9b1665879
sql/src/test/BugTracker-2010/Tests/crash_in_dce.Bug-2651.sql
--- /dev/null Thu Jan 01 00:00:00 1970 +
+++ b/sql/src/test/BugTracker-2010/Tests/crash_in_dce.Bug-2651.sql Fri Aug
13 09:27:01 2010 +0200
@@ -0,0 +1,37 @@
+CREATE TABLE "sys"."anbinew" (
+"naam" VARCHAR(128),
+"vestigingsplaats" VARCHAR(64),
+"beschikking" DATE,
+"einddatum"DATE,
+"intrekking" DATE
+);
+CREATE TABLE "sys"."anbikvk2" (
+"naam" VARCHAR(128),
+"vestigingsplaats" VARCHAR(32),
+"beschikking" DATE,
+"einddatum"DATE,
+"intrekking" DATE,
+"kvks" INTEGER
+);
+CREATE TABLE "sys"."kvk" (
+"id"INTEGER NOT NULL,
+"kvk" BIGINT,
+"bedrijfsnaam" VARCHAR(256),
+"adres" VARCHAR(256),
+"postcode" VARCHAR(10),
+"plaats"VARCHAR(32),
+"type" VARCHAR(14),
+"kvks" INTEGER,
+"sub" INTEGER,
+"bedrijfsnaam_size" SMALLINT,
+"adres_size"SMALLINT,
+CONSTRAINT "kvk_id_pkey" PRIMARY KEY ("id")
+);
+
+select naam, vestigingsplaats, beschikking, einddatum, intrekking, kvks
+from a
MonetDB: default - Merge with Jun2010 branch.
Changeset: 45c1f030e31d for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=45c1f030e31d
Modified Files:
sql/ChangeLog.Jun2010
sql/src/common/sql_types.mx
sql/src/server/rel_exp.mx
sql/src/test/BugTracker-2010/Tests/All
Branch: default
Log Message:
Merge with Jun2010 branch.
diffs (truncated from 583 to 300 lines):
diff -r 65a029afacb5 -r 45c1f030e31d MonetDB5/ChangeLog.Jun2010
--- a/MonetDB5/ChangeLog.Jun2010Thu Aug 12 12:44:23 2010 +0200
+++ b/MonetDB5/ChangeLog.Jun2010Thu Aug 12 22:43:43 2010 +0200
@@ -3,7 +3,7 @@
* Fri Jul 30 2010 Niels Nes
- Fixed bug 2557. There was a bug in the mergetable optimizer which was
- triggered by multi column (atleast 32 columns).
+ triggered by multi column (at least 32 columns).
* Wed Jul 28 2010 Martin Kersten
- Added missing multiplex version of MAL str.stringlength().
diff -r 65a029afacb5 -r 45c1f030e31d sql/ChangeLog.Jun2010
--- a/sql/ChangeLog.Jun2010 Thu Aug 12 12:44:23 2010 +0200
+++ b/sql/ChangeLog.Jun2010 Thu Aug 12 22:43:43 2010 +0200
@@ -1,6 +1,11 @@
# ChangeLog file for sql
# This file is updated with Maddlog
+* Thu Aug 12 2010 Niels Nes
+- Fixed bug 2353. The relational optimizer didn't handle range join
+ expressions properly.
+- fixed bug 2354. Improved function resolution.
+
* Mon Aug 9 2010 Jennie Zhang
- Fixed bug 2645: mat.pack+algebra.slice should be replaced by mat.slice
for 'limit 1' (when the default_pipe is used)
diff -r 65a029afacb5 -r 45c1f030e31d sql/src/common/sql_types.mx
--- a/sql/src/common/sql_types.mx Thu Aug 12 12:44:23 2010 +0200
+++ b/sql/src/common/sql_types.mx Thu Aug 12 22:43:43 2010 +0200
@@ -768,12 +768,7 @@
if (list_length(f->ops) == nrargs && is_subtype(tp,
&((sql_arg *) f->ops->h->data)->type)) {
unsigned int scale = 0;
- sql_subfunc *fres;
-
- /* member functions should not match binary
operators */
- if (nrargs == 2 && subtype_cmp( &((sql_arg *)
f->ops->h->data)->type, &((sql_arg *) f->ops->h->next->data)->type) == 0)
- continue;
- fres = ZNEW(sql_subfunc);
+ sql_subfunc *fres = ZNEW(sql_subfunc);
sql_ref_init(&(fres->ref));
fres->func = f;
diff -r 65a029afacb5 -r 45c1f030e31d sql/src/server/rel_exp.mx
--- a/sql/src/server/rel_exp.mx Thu Aug 12 12:44:23 2010 +0200
+++ b/sql/src/server/rel_exp.mx Thu Aug 12 22:43:43 2010 +0200
@@ -697,7 +697,10 @@
int
exp_is_join(sql_exp *e)
{
- if (e->type == e_cmp && e->flag != cmp_or && e->l && e->r && e->card >=
CARD_AGGR)
+ /* only simple compare expressions, ie not or lists
+ or range expressions (e->f)
+*/
+ if (e->type == e_cmp && e->flag != cmp_or && e->l && e->r && !e->f &&
e->card >= CARD_AGGR)
return 0;
return -1;
}
diff -r 65a029afacb5 -r 45c1f030e31d sql/src/test/BugTracker-2010/Tests/All
--- a/sql/src/test/BugTracker-2010/Tests/AllThu Aug 12 12:44:23 2010 +0200
+++ b/sql/src/test/BugTracker-2010/Tests/AllThu Aug 12 22:43:43 2010 +0200
@@ -42,3 +42,8 @@
unicode-bom.Bug-2641
mat.slice_limit1.Bug-2645
shift_with_cast.Bug-2638
+concat_type_check_problem.Bug-2354
+crash_on_where_in.Bug-2333
+assert_on_type_mismatch.Bug-2319
+crash_on_in_1.Bug-2352
+crash_on_complex_join_exp.Bug-2353
diff -r 65a029afacb5 -r 45c1f030e31d
sql/src/test/BugTracker-2010/Tests/assert_on_type_mismatch.Bug-2319.sql
--- /dev/null Thu Jan 01 00:00:00 1970 +
+++ b/sql/src/test/BugTracker-2010/Tests/assert_on_type_mismatch.Bug-2319.sql
Thu Aug 12 22:43:43 2010 +0200
@@ -0,0 +1,5 @@
+create table x (id1 varchar(1000), id2 int);
+create table dict (id int, x varchar(100));
+UPDATE dict SET id = (SELECT id2 FROM "x" WHERE id1=dict.id);
+drop table dict;
+drop table x;
diff -r 65a029afacb5 -r 45c1f030e31d
sql/src/test/BugTracker-2010/Tests/assert_on_type_mismatch.Bug-2319.stable.err
--- /dev/null Thu Jan 01 00:00:00 1970 +
+++
b/sql/src/test/BugTracker-2010/Tests/assert_on_type_mismatch.Bug-2319.stable.err
Thu Aug 12 22:43:43 2010 +0200
@@ -0,0 +1,66 @@
+stderr of test 'assert_on_type_mismatch.Bug-2319` in directory
'src/test/BugTracker-2010` itself:
+
+
+# 19:52:59 >
+# 19:52:59 > mserver5
"--config=/ufs/niels/scratch/rc/Linux-x86_64/etc/monetdb5.conf" --debug=10
--set gdk_nr_threads=0 --set
"monet_mod_path=/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB5:/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB5/lib:/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB5/bin"
--set "gdk_dbfarm=/ufs/niels/scratch/rc/Linux-x86_64/var/MonetDB5/dbfarm"
--set mapi_open=true --set xrpc_open=true --set mapi_port=32818 --set
xrpc_port=46410 --set monet_prompt= --set mal_listing=2 --trace
"--dbname=mTests_
MonetDB: default - Merge with Jun2010 branch.
Changeset: 2db8f576af35 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2db8f576af35 Modified Files: buildtools/doc/windowsbuild.rst Branch: default Log Message: Merge with Jun2010 branch. diffs (292 lines): diff -r f5d92eb02372 -r 2db8f576af35 buildtools/doc/windowsbuild.rst --- a/buildtools/doc/windowsbuild.rst Thu Aug 12 09:26:40 2010 +0200 +++ b/buildtools/doc/windowsbuild.rst Thu Aug 12 09:44:49 2010 +0200 @@ -40,13 +40,13 @@ order. Unless you know the inter-component dependencies, it is better to stick to this order. Also note that before the next component is built, the previous ones need to be installed. The section names are -the names of the CVS modules on SourceForge. +the names of the top-level folders in the Mercurial clone. buildtools -- The buildtools component is required in order to build the sources -from the CVS repository. If you get the pre-packaged sources +from the Mercurial repository. If you get the pre-packaged sources (i.e. the one in tar balls), you don't need the buildtools component (although this has not been tested on Windows). @@ -119,20 +119,36 @@ In order to compile the MonetDB suite of programs, several other programs and libraries need to be installed. Some further programs -and libraries can be optionally installed to enable optional -features. The required programs and libraries are listed in this -section, the following section lists the optional programs and -libraries. +and libraries can be optionally installed to enable optional features. +The required programs and libraries are listed in this section, the +following section lists the optional programs and libraries. -CVS (Concurrent Version System) +Mercurial (a.k.a. HG) +- -All sources of the MonetDB suite of programs are stored using CVS__ at -SourceForge__. You will need CVS to get the sources. We use CVS -under Cygwin__, but any other version will do as well. +All sources of the MonetDB suite of programs are stored using +Mercurial__ at our server__. You will need Mercurial to get the +sources. We use Mercurial under Cygwin__, but any other version will +do as well. -__ http://www.cvshome.org/ -__ http://sourceforge.net/projects/monetdb/ +Once Mercurial is installed and configured, you can get the sources +using the command + +:: + + hg clone http://dev.monetdb.org/hg/MonetDB/ + +This will create a folder ``MonetDB`` that contains everything. + +You can update the sources using (from within the above-mentioned +``MonetDB`` folder) + +:: + + hg pull -u + +__ http://mercurial.selenic.com/ +__ http://dev.monetdb.org/hg/MonetDB/ __ http://www.cygwin.com/ Compiler @@ -188,9 +204,8 @@ Flex is a fast lexical analyzer generator. A version of Flex for Windows can be gotten from the GnuWin32 project -at http://gnuwin32.sourceforge.net/. Click on the Packages -link on the left and then on Flex, and get the Setup file and install -it. +at http://gnuwin32.sourceforge.net/. Click on the Packages link on +the left and then on Flex, and get the Setup file and install it. Pthreads @@ -199,8 +214,8 @@ ftp://sources.redhat.com/pub/pthreads-win32/. You can download the latest pthreads-\*-release.exe which is a self-extracting archive. Extract it, and move or copy the contents of the Pre-built.2 folder to -``C:\Pthreads`` (so that you end up with folders ``C:\Pthreads\lib`` and -``C:\Pthreads\include``). +``C:\Pthreads`` (so that you end up with folders ``C:\Pthreads\lib`` +and ``C:\Pthreads\include``). On Windows64, in a command interpreter, run ``nmake clean VC`` in the extracted ``pthreads.2`` folder with the Visual Studio environment set @@ -218,9 +233,9 @@ only during testing. As such it is not a strict prerequisite. A version of Diff for Windows can be gotten from the GnuWin32 project -at http://gnuwin32.sourceforge.net/. Click on the Packages -link on the left and then on DiffUtils (note the name), and get the -Setup file and install it. +at http://gnuwin32.sourceforge.net/. Click on the Packages link on +the left and then on DiffUtils (note the name), and get the Setup file +and install it. Patch - @@ -260,16 +275,16 @@ the Win32 Installer, install it, and run it. It will come up with a window where you have to fill in the location of the source code and where to build the binaries. Fill in where you extracted the PCRE -sources, and some other directory (I used a ``build`` directory which -I created within the PCRE source tree). You need to configure some -PCRE build options. I chose to do build shared libs, to match -newlines with the ``ANYCRLF`` option, and to do have UTF-8 support and -support for Unicode properties. When you're satisfied with the -options, click on Configure, and then on Generate. Then in the build -directory you've chosen, open the PCRE.sln file with Visual Studio, -and build and install. Make sure you set the Sol
MonetDB: default - Merge with Jun2010 branch.
Changeset: 8670d9360669 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8670d9360669
Modified Files:
sql/ChangeLog.Jun2010
sql/src/test/BugTracker-2010/Tests/All
Branch: default
Log Message:
Merge with Jun2010 branch.
diffs (truncated from 411 to 300 lines):
diff -r 668907374273 -r 8670d9360669 sql/ChangeLog.Jun2010
--- a/sql/ChangeLog.Jun2010 Mon Aug 09 14:27:48 2010 +0200
+++ b/sql/ChangeLog.Jun2010 Tue Aug 10 09:14:50 2010 +0200
@@ -1,6 +1,10 @@
# ChangeLog file for sql
# This file is updated with Maddlog
+* Mon Aug 9 2010 Jennie Zhang
+- Fixed bug 2645: mat.pack+algebra.slice should be replaced by mat.slice
+ for 'limit 1' (when the default_pipe is used)
+
* Fri Aug 6 2010 Fabian Groffen
- Fixed bug #2641, The SQL server now handles Unicode BOM sequences
occurring in any place. Previously an "unexpected character (U+FEFF)"
diff -r 668907374273 -r 8670d9360669 sql/src/test/BugTracker-2010/Tests/All
--- a/sql/src/test/BugTracker-2010/Tests/AllMon Aug 09 14:27:48 2010 +0200
+++ b/sql/src/test/BugTracker-2010/Tests/AllTue Aug 10 09:14:50 2010 +0200
@@ -40,3 +40,4 @@
with_row_number_crash.Bug-2631
complex_query_crash.Bug-2633
unicode-bom.Bug-2641
+mat.slice_limit1.Bug-2645
diff -r 668907374273 -r 8670d9360669
sql/src/test/BugTracker-2010/Tests/mat.slice_limit1.Bug-2645.sql
--- /dev/null Thu Jan 01 00:00:00 1970 +
+++ b/sql/src/test/BugTracker-2010/Tests/mat.slice_limit1.Bug-2645.sql Tue Aug
10 09:14:50 2010 +0200
@@ -0,0 +1,47 @@
+create table slice_test (x int, y int, val int);
+insert into slice_test values ( 0, 1, 12985);
+insert into slice_test values ( 0, 1, 12985);
+insert into slice_test values ( 0, 1, 12985);
+insert into slice_test values ( 0, 1, 12985);
+insert into slice_test values ( 0, 1, 12985);
+insert into slice_test values ( 0, 1, 12985);
+insert into slice_test values ( 0, 1, 12985);
+insert into slice_test values ( 0, 1, 12985);
+insert into slice_test values ( 0, 1, 12985);
+insert into slice_test values ( 0, 1, 12985);
+insert into slice_test values ( 1, 1, 28323);
+insert into slice_test values ( 3, 5, 89439);
+
+insert into slice_test values ( 1, 1, 28323);
+insert into slice_test values ( 3, 5, 89439);
+
+insert into slice_test values ( 1, 1, 28323);
+insert into slice_test values ( 3, 5, 89439);
+
+insert into slice_test values ( 1, 1, 28323);
+insert into slice_test values ( 3, 5, 89439);
+
+insert into slice_test values ( 1, 1, 28323);
+insert into slice_test values ( 3, 5, 89439);
+
+insert into slice_test values ( 1, 1, 28323);
+insert into slice_test values ( 3, 5, 89439);
+
+insert into slice_test values ( 1, 1, 28323);
+insert into slice_test values ( 3, 5, 89439);
+
+insert into slice_test values ( 1, 1, 28323);
+insert into slice_test values ( 3, 5, 89439);
+
+insert into slice_test values ( 1, 1, 28323);
+insert into slice_test values ( 3, 5, 89439);
+
+insert into slice_test values ( 1, 1, 28323);
+insert into slice_test values ( 3, 5, 89439);
+
+explain select x,y from slice_test limit 1;
+
+explain select cast(x as string)||'-bla-'||cast(y as string) from slice_test
limit 1;
+
+drop table slice_test;
+
diff -r 668907374273 -r 8670d9360669
sql/src/test/BugTracker-2010/Tests/mat.slice_limit1.Bug-2645.stable.err
--- /dev/null Thu Jan 01 00:00:00 1970 +
+++ b/sql/src/test/BugTracker-2010/Tests/mat.slice_limit1.Bug-2645.stable.err
Tue Aug 10 09:14:50 2010 +0200
@@ -0,0 +1,78 @@
+stderr of test 'mat.slice_limit1.Bug-2645` in directory
'src/test/BugTracker-2010` itself:
+
+
+# 15:04:12 >
+# 15:04:12 > mserver5
"--config=/export/scratch0/zhang/monet-install/candidate/debug/etc/monetdb5.conf"
--debug=10 --set gdk_nr_threads=0 --set
"monet_mod_path=/export/scratch0/zhang/monet-install/candidate/debug/lib/MonetDB5:/export/scratch0/zhang/monet-install/candidate/debug/lib/MonetDB5/lib:/export/scratch0/zhang/monet-install/candidate/debug/lib/MonetDB5/bin"
--set
"gdk_dbfarm=/export/scratch0/zhang/monet-install/candidate/debug/var/MonetDB5/dbfarm"
--set mapi_open=true --set xrpc_open=true --set mapi_port=37776 --set
xrpc_port=42741 --set monet_prompt= --set mal_listing=2 --trace
"--dbname=mTests_src_test_BugTracker-2010" --set mal_listing=0 ; echo ; echo
Over..
+# 15:04:12 >
+
+# builtin opt gdk_arch = 64bitx86_64-unknown-linux-gnu
+# builtin opt gdk_version = 1.38.4
+# builtin opt prefix = /export/scratch0/zhang/monet-install/candidate/debug
+# builtin opt exec_prefix = ${prefix}
+# builtin opt gdk_dbname = demo
+# builtin opt gdk_dbfarm = ${prefix}/var/MonetDB/dbfarm
+# builtin opt gdk_debug = 0
+# builtin opt gdk_alloc_map = no
+# builtin opt gdk_vmtrim = yes
+# builtin opt monet_admin = adm
+# builtin opt monet_prompt = >
+# builtin opt monet_welcome = yes
+# builtin opt monet_mod_path = ${exec_prefix}/lib/MonetDB
+# builtin opt monet_daemon = no
+# builtin opt host = localhost
+# builtin opt mapi_port = 5
+# builtin opt mapi_clients = 2
+# builtin
MonetDB: default - merge with Jun2010; ignoring changes of chang...
Changeset: a0e8dd634ac5 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a0e8dd634ac5 Modified Files: pathfinder/modules/pftijah/Tests/All pathfinder/tests/BugTracker/Tests/All Branch: default Log Message: merge with Jun2010; ignoring changes of changeset a0703fcf65c3 " skip more pathfinder tests with MPS that are bound to fail due to non MPS supported functions: tijah:terms, tijah:tf, tijah:tf-all, tijah:fb-terms, fn:node-name, fn:doc-available, fn:trace (in the Jun2010 release branch only; changes will not be propagated to default branch) " ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - merge with Jun2010; ignoring changes of chang...
Changeset: 02c1b887dfd8 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=02c1b887dfd8 Modified Files: pathfinder/tests/BugDay_2005-12-19_0.9.3/Tests/All pathfinder/tests/W3C_use_cases/XQUF/Parts/Tests/All pathfinder/tests/W3C_use_cases/XQUF/R/Tests/All Branch: default Log Message: merge with Jun2010; ignoring changes of changeset 5453167b6b95 " skip more pathfinder tests with MPS that are bound to fail due to "pf:number not supported" (in the Jun2010 release branch only; changes will not be propagated to default branch) " ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - merge with Jun2010
Changeset: cf84208ca2a9 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=cf84208ca2a9 Modified Files: Branch: default Log Message: merge with Jun2010 diffs (17 lines): diff -r 51580c5e5c45 -r cf84208ca2a9 MonetDB/src/gdk/gdk_system.mx --- a/MonetDB/src/gdk/gdk_system.mx Fri Jul 30 10:36:37 2010 +0200 +++ b/MonetDB/src/gdk/gdk_system.mx Fri Jul 30 11:46:14 2010 +0200 @@ -630,8 +630,12 @@ * http://ndevilla.free.fr/threads/ */ #ifdef WIN32 - ncpus = 1; + SYSTEM_INFO sysinfo; + + GetSystemInfo( &sysinfo ); + ncpus = sysinfo.dwNumberOfProcessors; #endif + if (ncpus <= 0) return MT_check_nr_cores_(); return ncpus; ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - merge with Jun2010
Changeset: 8cba17ea123b for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8cba17ea123b
Modified Files:
Branch: default
Log Message:
merge with Jun2010
diffs (274 lines):
diff -r 0d31e2ec9d1d -r 8cba17ea123b
pathfinder/runtime/Tests/serialization-mclient.stable.err.NoAlgebra
--- /dev/null Thu Jan 01 00:00:00 1970 +
+++ b/pathfinder/runtime/Tests/serialization-mclient.stable.err.NoAlgebra
Fri Jul 30 10:18:15 2010 +0200
@@ -0,0 +1,40 @@
+stderr of test 'serialization-mclient` in directory 'runtime` itself:
+
+
+# 19:58:59 >
+# 19:58:59 > Mtimeout -timeout 420 Mserver
"--config=/net/corona.ins.cwi.nl/export/scratch0/manegold/Monet/Testing/Current/prefix.--enable-strict_--disable-debug_--enable-optimize/etc/MonetDB.conf"
--debug=10 --set
"monet_mod_path=/net/corona.ins.cwi.nl/export/scratch0/manegold/Monet/Testing/Current/prefix.--enable-strict_--disable-debug_--enable-optimize/lib64/MonetDB4:/net/corona.ins.cwi.nl/export/scratch0/manegold/Monet/Testing/Current/prefix.--enable-strict_--disable-debug_--enable-optimize/lib64/MonetDB4/lib:/net/corona.ins.cwi.nl/export/scratch0/manegold/Monet/Testing/Current/prefix.--enable-strict_--disable-debug_--enable-optimize/lib64/MonetDB4/bin"
--set
"gdk_dbfarm=/net/corona.ins.cwi.nl/export/scratch0/manegold/Monet/Testing/Current/prefix.--enable-strict_--disable-debug_--enable-optimize/var/MonetDB4/dbfarm"
--set
"sql_logdir=/net/corona.ins.cwi.nl/export/scratch0/manegold/Monet/Testing/Current/prefix.--enable-strict_--disable-debug_--enable-optimize/var/MonetD
B4/sql_logs" --set
"xquery_logdir=/net/corona.ins.cwi.nl/export/scratch0/manegold/Monet/Testing/Current/prefix.--enable-strict_--disable-debug_--enable-optimize/var/MonetDB4/xquery_logs"
--set mapi_open=true --set xrpc_open=true --set mapi_port=39161 --set
xrpc_port=47285 --set monet_prompt= --trace "--dbname=mTests_runtime"
--dbinit=" module(pathfinder);" ; echo ; echo Over..
+# 19:58:59 >
+
+
+# 19:59:00 >
+# 19:59:00 > Mtimeout -timeout 300 /usr/bin/python
serialization-mclient.XQUERY.py serialization-mclient
+# 19:59:00 >
+
+
+mode="xml"
+
+mode="xml-typed"
+
+mode="xml-noheader"
+
+mode="xml-noroot"
+
+mode="xml-root-name"
+
+mode="dm"
+
+mode="seq"
+
+mode="text"
+MAPI = mone...@corona:39161
+QUERY = (1, 2.3, attribute attr { "val" }, 3E1, "string",
doc("nodekinds.xml")/descendant-or-self::node())
+ERROR = !ERROR: xquery_print_result_loop: operation failed.
+
+mode="text" (w/o top-level attribute)
+
+mode="" (default)
+
+# 19:59:00 >
+# 19:59:00 > Done.
+# 19:59:00 >
+
diff -r 0d31e2ec9d1d -r 8cba17ea123b
pathfinder/runtime/Tests/serialization.stable.out.NoAlgebra
--- /dev/null Thu Jan 01 00:00:00 1970 +
+++ b/pathfinder/runtime/Tests/serialization.stable.out.NoAlgebra Fri Jul
30 10:18:15 2010 +0200
@@ -0,0 +1,147 @@
+stdout of test 'serialization` in directory 'runtime` itself:
+
+
+# 13:48:28 >
+# 13:48:28 > Mtimeout -timeout 60 Mserver
"--config=/local_tmp/MonetDB/Linux/etc/MonetDB.conf" --debug=10 --set
"monet_mod_path=/local_tmp/pathfinder/Linux/lib/MonetDB:/local_tmp/MonetDB/Linux/lib/MonetDB"
--set "gdk_dbfarm=/local_tmp/MonetDB/Linux/var/MonetDB/dbfarm" --set
"sql_logdir=/local_tmp/MonetDB/Linux/var/MonetDB/log" --set mapi_port=30625
--set monet_prompt= --trace --dbname=mTests_runtime < serialization.milS
+# 13:48:28 >
+
+# Monet Database Server V4.11.3
+# Copyright (c) 1993-2006, CWI. All rights reserved.
+# Compiled for i686-suse-linux/32bit with 32bit OIDs; dynamically linked.
+# Visit http://monetdb.cwi.nl/ for further information.
+module("pathfinder");
+
+# query for all output modes (contains all different kinds)
+var query := "(1, 2.3, attribute attr { \"val\" }, 3E1, \"string\",
doc(\"nodekinds.xml\")/descendant-or-self::node())";
+var query_no_attr := "(1, 2.3, 3E1, \"string\",
doc(\"nodekinds.xml\")/descendant-or-self::node())";
+
+# current different XML modes
+#
+xquery("xml",query , 0).printf();
+
+1 2.30 30.00 stringtexttexttext
+
+xquery("xml-typed" ,query , 0).printf();
+
+http://monetdb.cwi.nl/XQuery/results";
xmlns:xs="http://www.w3.org/2001/XMLSchema";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>12.3030.00stringtexttexttext
+
+# ... and their corresponding mapi variants
+xquery("mapi-xml" ,query , 0).printf();
+=
+=1 2.30 30.00 stringtexttexttext
+
+xquery("mapi-xml-typed" ,query , 0).printf();
+=
+=http://monetdb.cwi.nl/XQuery/results";
xmlns:xs="http://www.w3.org/2001/XMLSchema";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>12.3030.00stringtexttexttext
+
+
+# additional XML mode arguments:
+#
+xquery("xml-noheader" ,query , 0).printf();
+1 2.30 30.00 stringtexttexttext
+
+# does not work for xml-typed mode
+xquery("xml-noroot" ,query , 0).printf();
+
+1 2.30 30.00 stringtexttexttext
+
+# does not work for xml-typed mode
+xquery("xml-root-name" ,query , 0).printf();
+
+1 2.30
MonetDB: default - merge with Jun2010
Changeset: 0d31e2ec9d1d for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0d31e2ec9d1d Modified Files: sql/ChangeLog.Jun2010 Branch: default Log Message: merge with Jun2010 diffs (59 lines): diff -r 9b228fad4fe4 -r 0d31e2ec9d1d MonetDB5/ChangeLog.Jun2010 --- a/MonetDB5/ChangeLog.Jun2010Fri Jul 30 08:16:10 2010 +0200 +++ b/MonetDB5/ChangeLog.Jun2010Fri Jul 30 09:04:37 2010 +0200 @@ -1,16 +1,24 @@ # ChangeLog file for MonetDB5 # This file is updated with Maddlog +* Wed Jul 28 2010 Martin Kersten +- Added missing multiplex version of MAL str.stringlength(). + This improves performance of SQL length(). + +* Tue Jul 27 2010 Martin Kersten +- Protect dataflow against multi-assignments. + This fixes bugs 2626 & 2614. + * Thu Jul 22 2010 Sjoerd Mullender - Slight change to Fedora, Debian, Ubuntu installers: the database directory now has the group setuid bit set so that new databases inherit the group ownership (monetdb). * Thu Jul 15 2010 Stefan Manegold -- restored genuine original mitosis logic by disabling +- Restored genuine original mitosis logic by disabling incorrect octopus dominance (even when octopus was not enabled); basically a selective back-port of changesets http://dev.monetdb.org/hg/MonetDB/rev/2a358751a4b6 http://dev.monetdb.org/hg/MonetDB/rev/692eff15bea0 from the default - branch + branch. This fixes bug 2596. diff -r 9b228fad4fe4 -r 0d31e2ec9d1d clients/ChangeLog.Jun2010 --- a/clients/ChangeLog.Jun2010 Fri Jul 30 08:16:10 2010 +0200 +++ b/clients/ChangeLog.Jun2010 Fri Jul 30 09:04:37 2010 +0200 @@ -8,3 +8,7 @@ - In case of an incomplete line from the server, add a newline. This fixes bug 2619. +* Mon Jul 19 2010 Sjoerd Mullender +- Avoid using SQLROWSETSIZE and SQLROWOFFSET. + This fixes bug 2558. + diff -r 9b228fad4fe4 -r 0d31e2ec9d1d sql/ChangeLog.Jun2010 --- a/sql/ChangeLog.Jun2010 Fri Jul 30 08:16:10 2010 +0200 +++ b/sql/ChangeLog.Jun2010 Fri Jul 30 09:04:37 2010 +0200 @@ -1,6 +1,14 @@ # ChangeLog file for sql # This file is updated with Maddlog +* Thu Jul 29 2010 Niels Nes +- Fixed ORdER BY over UNION etc. (bug 2606) by + automatically adding select * around select x union select y order by z. + +* Thu Jul 29 2010 Niels Nes +- Fixed bug in handling 'WITH' and row_number() (Bug 2631). + The cardinality of the row_number expression was incorrect. + * Tue Jul 20 2010 Sjoerd Mullender - Fixed bug 2624: function returning decimal returned result that was scaled incorrectly. ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - merge with Jun2010
Changeset: 9b228fad4fe4 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9b228fad4fe4
Modified Files:
Branch: default
Log Message:
merge with Jun2010
diffs (36 lines):
diff -r 493e9cc28c87 -r 9b228fad4fe4 MonetDB5/RunMtest.in
--- a/MonetDB5/RunMtest.in Fri Jul 30 08:08:40 2010 +0200
+++ b/MonetDB5/RunMtest.in Fri Jul 30 08:16:10 2010 +0200
@@ -29,7 +29,7 @@
MOD_PATH="${MOD_PATH}${builddir}/$d/.libs:${builddir}/$d:"
# enable auto-loading of modules before `make install`
mkdir -p ${builddir}/$d/autoload
- cp -f ${srcdir}/$d/[0-9][0-9]_*.mal ${builddir}/$d/autoload/
+ cp -f ${srcdir}/$d/[0-9][0-9]_*.mal ${builddir}/$d/autoload/ 2>/dev/null
done
# make sure scripts are executable
diff -r 493e9cc28c87 -r 9b228fad4fe4 geom/RunMtest.in
--- a/geom/RunMtest.in Fri Jul 30 08:08:40 2010 +0200
+++ b/geom/RunMtest.in Fri Jul 30 08:16:10 2010 +0200
@@ -42,7 +42,7 @@
MOD_PATH="${MOD_PATH}${builddir}/$d/.libs:${builddir}/$d:"
# enable auto-loading of modules before `make install`
mkdir -p ${builddir}/$d/autoload
- cp -f ${srcdir}/$d/[0-9][0-9]_*.mal ${builddir}/$d/autoload/
+ cp -f ${srcdir}/$d/[0-9][0-9]_*.mal ${builddir}/$d/autoload/ 2>/dev/null
done
MOD_PATH="${MOD_PATH}`monetdb-sql-config --modpath$V`:"
MOD_PATH="${MOD_PATH}`monetdb$V-config --modpath`"
diff -r 493e9cc28c87 -r 9b228fad4fe4 sql/RunMtest.in
--- a/sql/RunMtest.in Fri Jul 30 08:08:40 2010 +0200
+++ b/sql/RunMtest.in Fri Jul 30 08:16:10 2010 +0200
@@ -29,7 +29,7 @@
MOD_PATH="${MOD_PATH}${builddir}/$d/.libs:${builddir}/$d:"
# enable auto-loading of modules before `make install`
mkdir -p ${builddir}/$d/autoload
- cp -f ${srcdir}/$d/[0-9][0-9]_*.mal ${builddir}/$d/autoload/
+ cp -f ${srcdir}/$d/[0-9][0-9]_*.mal ${builddir}/$d/autoload/ 2>/dev/null
done
MOD_PATH="${MOD_PATH}`monetdb5-config --modpath`"
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - merge with Jun2010; ignoring changes of chang...
Changeset: 7abf45a5749a for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7abf45a5749a Modified Files: pathfinder/benchmarks/MBench/Tests/All pathfinder/benchmarks/Music/Tests/All pathfinder/benchmarks/Music/mod/MIL/Tests/All pathfinder/benchmarks/Music/mod/XQ/Tests/All pathfinder/benchmarks/X007/Tests/All pathfinder/benchmarks/XBench/DC/MD/Tests/All pathfinder/benchmarks/XMark/Tests/All pathfinder/benchmarks/XMark/XRpc/Tests/All pathfinder/benchmarks/XMark/mod/MIL/Tests/All pathfinder/benchmarks/XMark/mod/XQ/Tests/All pathfinder/benchmarks/XMark/opt/MIL/Tests/All pathfinder/benchmarks/XMark/opt/XQ/Tests/All pathfinder/benchmarks/XPath/Tests/All pathfinder/benchmarks/XPathMark/Tests/All pathfinder/compiler/Tests/All pathfinder/tests/BugTracker/Tests/All pathfinder/tests/BugsViaSourgeforce/Tests/All pathfinder/tests/Update/Tests/All pathfinder/tests/W3C_use_cases/XQ/R/Tests/All pathfinder/tests/W3C_use_cases/XQ/XMP/Tests/All pathfinder/tests/WebSite/Tests/All pathfinder/tests/XQuery/Tests/All Branch: default Log Message: merge with Jun2010; ignoring changes of changeset 9d772ddc905d " skip pathfinder tests with MPS that are bound to fail due to "pf:number not supported" (in the Jun2010 release branch only; changes will not be propagated to default branch) " ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merge with Jun2010 branch.
Changeset: 038a15cf73c4 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=038a15cf73c4 Modified Files: sql/src/benchmarks/uva/c1.sql sql/src/benchmarks/uva/c2.sql sql/src/benchmarks/uva/c3.sql sql/src/benchmarks/uva/cees.txt sql/src/benchmarks/uva/cees/VxSegmentDoubleFeature_tab.txt sql/src/benchmarks/uva/cees/VxSegmentIntFeature_tab.txt sql/src/benchmarks/uva/cees/VxSegmentStringFeature_tab.txt sql/src/benchmarks/uva/cees/VxSegment_tab.txt sql/src/benchmarks/uva/cees/VxSegmentation_tab.txt sql/src/benchmarks/uva/cees/times sql/src/benchmarks/uva/count.sql sql/src/benchmarks/uva/drop.sql sql/src/benchmarks/uva/dump.sql sql/src/benchmarks/uva/j1.sql sql/src/benchmarks/uva/j2.sql sql/src/benchmarks/uva/j3.sql sql/src/benchmarks/uva/j4.sql sql/src/benchmarks/uva/journaal.txt sql/src/benchmarks/uva/journaal/VxSegmentDoubleFeature_tab.txt sql/src/benchmarks/uva/journaal/VxSegmentIntFeature_tab.txt sql/src/benchmarks/uva/journaal/VxSegmentStringFeature_tab.txt sql/src/benchmarks/uva/journaal/VxSegment_tab.txt sql/src/benchmarks/uva/journaal/VxSegmentation_tab.txt sql/src/benchmarks/uva/journaal/times sql/src/benchmarks/uva/load-cees.sql sql/src/benchmarks/uva/load-journaal.sql sql/src/benchmarks/uva/makeTables.sql sql/src/benchmarks/uva/run.all Branch: default Log Message: Merge with Jun2010 branch. diffs (truncated from 145745 to 300 lines): diff -r 8bb68df6d269 -r 038a15cf73c4 sql/src/benchmarks/uva/c1.sql --- a/sql/src/benchmarks/uva/c1.sql Wed Jul 28 13:50:01 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 + @@ -1,10 +0,0 @@ -SELECT DISTINCT segment0.id -FROM VxSegment_tab segment0, - VxSegmentation_tab segmentation0, - VxSegmentStringFeature_tab feat0_0 -WHERE (segment0.segmentationId = segmentation0.id) AND - (segmentation0.name = 'demo') AND - (feat0_0.segmentId = segment0.id) AND - (feat0_0.fieldName = 'team') AND - (feat0_0.value = 'Feyenoord'); - diff -r 8bb68df6d269 -r 038a15cf73c4 sql/src/benchmarks/uva/c2.sql --- a/sql/src/benchmarks/uva/c2.sql Wed Jul 28 13:50:01 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 + @@ -1,14 +0,0 @@ -SELECT DISTINCT segment0.id -FROM VxSegment_tab segment0, - VxSegmentation_tab segmentation0, - VxSegmentStringFeature_tab feat0_0, - VxSegmentStringFeature_tab feat0_1 -WHERE (segment0.segmentationId = segmentation0.id) AND - (segmentation0.name = 'demo') AND - (feat0_0.segmentId = segment0.id) AND - (feat0_0.fieldName = 'team') AND - (feat0_0.value = 'Lazio Roma') AND - (feat0_1.segmentId = segment0.id) AND - (feat0_1.fieldName = 'type') AND - (feat0_1.value = 'Yellow'); - diff -r 8bb68df6d269 -r 038a15cf73c4 sql/src/benchmarks/uva/c3.sql --- a/sql/src/benchmarks/uva/c3.sql Wed Jul 28 13:50:01 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 + @@ -1,9 +0,0 @@ -SELECT DISTINCT segment0.id -FROM VxSegment_tab segment0, - VxSegmentation_tab segmentation0, - VxSegmentStringFeature_tab feat0_0 -WHERE (segment0.segmentationId = segmentation0.id) AND - (segmentation0.name = 'demo') AND - (feat0_0.segmentId = segment0.id) AND - (feat0_0.fieldName = 'type') AND - (feat0_0.value = 'Goal'); diff -r 8bb68df6d269 -r 038a15cf73c4 sql/src/benchmarks/uva/cees.txt --- a/sql/src/benchmarks/uva/cees.txt Wed Jul 28 13:50:01 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 + @@ -1,28 +0,0 @@ -sqlplus cees/c...@csys - - -SQL> @c1 - -ID --- - 20701 - 20703 - 20704 - - -SQL> @c2 - -ID --- - 20711 - - -SQL> @c3 - -ID --- - 20701 - 20702 - 20705 - 20709 - diff -r 8bb68df6d269 -r 038a15cf73c4 sql/src/benchmarks/uva/cees/VxSegmentDoubleFeature_tab.txt --- a/sql/src/benchmarks/uva/cees/VxSegmentDoubleFeature_tab.txtWed Jul 28 13:50:01 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 + @@ -1,7610 +0,0 @@ - 1877,belief , .106383 - 1878,belief , .182927 - 1879,belief , .106383 - 1880,belief , .067 - 1881,belief , .0238095 - 1882,belief , .125 - 1883,belief , .272727 - 1884,belief , .486111 - 1885,belief , .0769231 - 1886,belief , .0952381 - 1887,belief , .67 - 1888,belief , .315789 - 1889,belief , .605263 - 1890,belief , .0952381 - 1891,belief , .263158 - 1892,belief , .0967742 - 1893,belief , .538462 - 1894,belief , .137931 - 1895,belief , .210526 - 1896,belief
MonetDB: default - Merge with Jun2010 branch.
Changeset: 696a19ff66a7 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=696a19ff66a7
Modified Files:
MonetDB/src/gdk/gdk.mx
MonetDB/src/gdk/gdk_align.mx
MonetDB/src/gdk/gdk_bat.mx
MonetDB/src/gdk/gdk_batop.mx
MonetDB/src/gdk/gdk_relop.mx
MonetDB/src/gdk/gdk_setop.mx
MonetDB4/src/modules/contrib/oo7.mx
MonetDB5/src/optimizer/opt_reorder.mx
Branch: default
Log Message:
Merge with Jun2010 branch.
diffs (truncated from 323 to 300 lines):
diff -r a03cd9c551a1 -r 696a19ff66a7 MonetDB/src/gdk/gdk.mx
--- a/MonetDB/src/gdk/gdk.mxWed Jul 28 10:18:23 2010 +0200
+++ b/MonetDB/src/gdk/gdk.mxWed Jul 28 13:21:44 2010 +0200
@@ -642,10 +642,13 @@
#define FATALcheck(tst,msg) if (tst) GDKfatal(msg);
#define ERRORcheck(tst,msg) if (tst) { GDKerror(msg); return 0; }
#define WARNcheck(tst, msg) if (tst) GDKwarning(msg)
-#define BATcheck(tst, msg)\
- if (tst == NULL) { \
- GDKerror("%s: BAT required.\n",msg);\
- return 0; \
+#define BATcheck(tst, msg)\
+ if (tst == NULL) { \
+ if (strchr(msg, ':')) \
+ GDKerror("%s.\n",msg); \
+ else\
+ GDKerror("%s: BAT required.\n",msg);\
+ return 0; \
}
/* needed for mel */
diff -r a03cd9c551a1 -r 696a19ff66a7 MonetDB/src/gdk/gdk_align.mx
--- a/MonetDB/src/gdk/gdk_align.mx Wed Jul 28 10:18:23 2010 +0200
+++ b/MonetDB/src/gdk/gdk_align.mx Wed Jul 28 13:21:44 2010 +0200
@@ -85,7 +85,7 @@
int
ALIGNcommit(BAT *b)
{
- BATcheck(b, "ALIGNcommit: bat required");
+ BATcheck(b, "ALIGNcommit");
if (!b->halign) {
b->halign = OIDnew(1);
}
@@ -98,7 +98,7 @@
int
ALIGNundo(BAT *b)
{
- BATcheck(b, "ALIGNundo: bat required");
+ BATcheck(b, "ALIGNundo");
return 0;
}
@@ -214,7 +214,7 @@
BAT *bn;
bat hp;
- BATcheck(h, "VIEWhcreate: bat required");
+ BATcheck(h, "VIEWhcreate");
recycled = bs = BBPrecycle(TYPE_void, TYPE_void, 1);
if (bs == NULL)
bs = BATcreatedesc(h->htype, TYPE_void, FALSE);
@@ -264,8 +264,8 @@
BAT *bn;
bat hp = 0, tp = 0, vc = 0;
- BATcheck(h, "VIEWcreate_: bat required");
- BATcheck(t, "VIEWcreate_: bat required");
+ BATcheck(h, "VIEWcreate_");
+ BATcheck(t, "VIEWcreate_");
recycled = bs = BBPrecycle(TYPE_void, TYPE_void, 1);
if (!bs)
bs = BATcreatedesc(h->htype, t->ttype, FALSE);
@@ -449,7 +449,7 @@
oid h, *x;
chr tshift;
- BATcheck(b, "BATmaterialize: bat required");
+ BATcheck(b, "BATmaterialize");
assert(!isVIEW(b));
ht = b->htype;
cnt = BATcapacity(b);
diff -r a03cd9c551a1 -r 696a19ff66a7 MonetDB/src/gdk/gdk_bat.mx
--- a/MonetDB/src/gdk/gdk_bat.mxWed Jul 28 10:18:23 2010 +0200
+++ b/MonetDB/src/gdk/gdk_bat.mxWed Jul 28 13:21:44 2010 +0200
@@ -1149,7 +1149,7 @@
BAT *bm;
BATcheck(b, "BUNins");
- BATcheck(h, "BUNins: head value is nil\n");
+ BATcheck(h, "BUNins: head value is nil");
countonly = (b->htype == TYPE_void && b->ttype == TYPE_void);
bm = BBP_cache(-b->batCacheid);
@@ -1717,7 +1717,7 @@
BUN p;
BATcheck(b, "BUNdel");
- BATcheck(x, "BUNdel: head value is nil\n");
+ BATcheck(x, "BUNdel: head value is nil");
if ((p = BUNlocate(b, x, y)) != BUN_NONE) {
ALIGNdel(b, "BUNdel", force); /* zap alignment info */
@@ -1841,9 +1841,9 @@
{
BUN p;
- BATcheck(b, "BUNreplace\n");
- BATcheck(h, "BUNreplace: head value is nil\n");
- BATcheck(t, "BUNreplace: tail value is nil\n");
+ BATcheck(b, "BUNreplace");
+ BATcheck(h, "BUNreplace: head value is nil");
+ BATcheck(t, "BUNreplace: tail value is nil");
if ((p = BUNfnd(b, h)) == BUN_NONE)
return b;
@@ -1994,8 +1994,8 @@
BUN p, q;
BAT *v = NULL;
- BATcheck(b, "BUNlocate: BAT parameter");
- BATcheck(x, "BUNlocate: value parameter");
+ BATcheck(b, "BUNlocate: BAT parameter required");
+ BATcheck(x, "BUNlocate: value parameter required");
hcmp = BATatoms[b->htype].atomCmp;
tcmp = BATatoms[b->ttype].atomCmp;
p = BUNfirst(b);
@@ -3082,7 +3082,7 @@
bit isKey = FALSE;
BAT *parent;
- BATcheck(b, "BATpropcheck: BAT parameter");
+ BATcheck(b, "BATpropcheck");
if (b->halign == 0) {
b->batDirtydesc = 1;
b->halign = OIDnew(1);
diff -r a
MonetDB: default - Merge with Jun2010 branch.
Changeset: 419c11d5bfa7 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=419c11d5bfa7
Modified Files:
Branch: default
Log Message:
Merge with Jun2010 branch.
diffs (50 lines):
diff -r 3b40c80c9172 -r 419c11d5bfa7 MonetDB5/src/modules/atoms/str.mx
--- a/MonetDB5/src/modules/atoms/str.mx Tue Jul 27 13:44:44 2010 +0200
+++ b/MonetDB5/src/modules/atoms/str.mx Wed Jul 28 09:53:58 2010 +0200
@@ -295,6 +295,7 @@
str_export int strConcat(str *res, str s, ptr val, int t);
str_export int strLength(int *res, str s);
+str_export int strSQLLength(int *res, str s);
str_export int strBytes(int *res, str s);
str_export int strTail(str *res, str s, int *offset);
str_export int strSubString(str *res, str s, int *offset, int *length);
@@ -2183,6 +2184,16 @@
*Res = res;
return GDK_SUCCEED;
}
+int
+strSQLLength(int *res, str s)
+{
+ str r = NULL;
+ strRtrim(&r, s);
+ strLength(res, r);
+ GDKfree(r);
+ return GDK_SUCCEED;
+}
+
@
@- Wrappers
Here you find the wrappers around the version 4 library code
diff -r 3b40c80c9172 -r 419c11d5bfa7 MonetDB5/src/modules/kernel/batstr.mx
--- a/MonetDB5/src/modules/kernel/batstr.mx Tue Jul 27 13:44:44 2010 +0200
+++ b/MonetDB5/src/modules/kernel/batstr.mx Wed Jul 28 09:53:58 2010 +0200
@@ -37,6 +37,10 @@
address STRbatLength
comment "Return the length of a string.";
+command batstr.stringlength( s:bat[:oid,:str] ) :bat[:oid,:int]
+address STRbatstringLength
+comment "Return the length of a right trimed string.";
+
command batstr.nbytes( s:bat[:oid,:str] ) :bat[:oid,:int]
address STRbatBytes
comment "Return the string length in bytes.";
@@ -264,6 +268,7 @@
@c
@:BATint(Length,strLength,str)@
+@:BATint(stringLength,strSQLLength,str)@
@:BATint(Bytes,strBytes,str)@
@= BATstr
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merge with Jun2010 branch.
Changeset: e3e3d12993a9 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e3e3d12993a9
Modified Files:
Branch: default
Log Message:
Merge with Jun2010 branch.
diffs (15 lines):
diff -r 987b1a26e472 -r e3e3d12993a9 clients/src/mapilib/Mapi.mx
--- a/clients/src/mapilib/Mapi.mx Tue Jul 27 08:58:03 2010 +0200
+++ b/clients/src/mapilib/Mapi.mx Tue Jul 27 11:19:28 2010 +0200
@@ -2339,10 +2339,9 @@
#ifdef HAVE_SYS_UN_H
if (mid->hostname == NULL) {
struct stat st;
- struct sockaddr_un s; /* just for sizeof(s.sun_path) */
snprintf(errbuf, sizeof(errbuf),
CLIENTS_PREFIX "/var/MonetDB5/dbfarm/mapi_socket");
- if (strlen(errbuf) <= sizeof(s.sun_path) &&
+ if (strlen(errbuf) <= sizeof(((struct sockaddr_un *)
0)->sun_path) &&
stat(errbuf, &st) != 1 &&
S_ISSOCK(st.st_mode))
mid->hostname = strdup(errbuf);
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merge with Jun2010 branch.
Changeset: 0a24bc154be0 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0a24bc154be0
Modified Files:
MonetDB/src/gdk/gdk.mx
MonetDB/src/gdk/gdk_posix.mx
geom/NT/rules.msc
sql/src/server/sql_parser.mx
Branch: default
Log Message:
Merge with Jun2010 branch.
diffs (truncated from 518 to 300 lines):
diff -r 22d72d45a13a -r 0a24bc154be0 MonetDB/src/common/monet_options.mx
--- a/MonetDB/src/common/monet_options.mx Fri Jul 23 17:02:10 2010 +0200
+++ b/MonetDB/src/common/monet_options.mx Fri Jul 23 18:10:40 2010 +0200
@@ -274,7 +274,7 @@
char *s, *t, *val;
int quote;
- for (s = buf; *s && isspace((int) (*s)); s++)
+ for (s = buf; *s && isspace((int) (unsigned char) *s); s++)
;
if (*s == '#')
continue; /* commentary */
@@ -289,12 +289,12 @@
}
*val = 0;
- for (t = s; *t && !isspace((int) (*t)); t++)
+ for (t = s; *t && !isspace((int) (unsigned char) *t); t++)
;
*t = 0;
/* skip any leading blanks in the value part */
- for (val++; *val && isspace((int) (*val)); val++)
+ for (val++; *val && isspace((int) (unsigned char) *val); val++)
;
/* search to unquoted # */
@@ -311,7 +311,7 @@
exit(1);
}
/* remove trailing white space */
- while (isspace((int) (t[-1])))
+ while (isspace((int) (unsigned char) t[-1]))
t--;
*t++ = 0;
diff -r 22d72d45a13a -r 0a24bc154be0 MonetDB/src/common/stream.mx
--- a/MonetDB/src/common/stream.mx Fri Jul 23 17:02:10 2010 +0200
+++ b/MonetDB/src/common/stream.mx Fri Jul 23 18:10:40 2010 +0200
@@ -380,16 +380,10 @@
#ifdef NATIVE_WIN32
{
- int sockopt = SO_SYNCHRONOUS_NONALERT;
WSADATA w;
if (WSAStartup(0x0101, &w) != 0)
return -1;
-
- if (setsockopt(INVALID_SOCKET, SOL_SOCKET, SO_OPENTYPE, (void
*) &sockopt, sizeof(sockopt)) < 0) {
- WSACleanup();
- return -1;
- }
}
#endif
inited = 1;
diff -r 22d72d45a13a -r 0a24bc154be0 MonetDB/src/gdk/gdk.mx
--- a/MonetDB/src/gdk/gdk.mxFri Jul 23 17:02:10 2010 +0200
+++ b/MonetDB/src/gdk/gdk.mxFri Jul 23 18:10:40 2010 +0200
@@ -417,10 +417,10 @@
#define MIN(A,B) ((A)>(B)?(B):(A))
/* defines from ctype with casts that allow passing char values */
-#define GDKisprint(c) isprint((int) ((unsigned char) (c)))
-#define GDKisspace(c) isspace((int) ((unsigned char) (c)))
-#define GDKisalnum(c) isalnum((int) ((unsigned char) (c)))
-#define GDKisgraph(c) isgraph((int) ((unsigned char) (c)))
+#define GDKisprint(c) isprint((int) (unsigned char) (c))
+#define GDKisspace(c) isspace((int) (unsigned char) (c))
+#define GDKisalnum(c) isalnum((int) (unsigned char) (c))
+#define GDKisgraph(c) isgraph((int) (unsigned char) (c))
#define GDKisdigit(c) (((unsigned char) (c)) >= '0' && ((unsigned char) (c))
<= '9')
#define GDKisxcntrl(c) (((unsigned char) (c)) >= 128 && ((unsigned char) (c))
<= 160)
#define GDKisspecial(c) (((unsigned char) (c)) >= 161 && ((unsigned char) (c))
<= 191)
diff -r 22d72d45a13a -r 0a24bc154be0 MonetDB/src/gdk/gdk_posix.mx
--- a/MonetDB/src/gdk/gdk_posix.mx Fri Jul 23 17:02:10 2010 +0200
+++ b/MonetDB/src/gdk/gdk_posix.mx Fri Jul 23 18:10:40 2010 +0200
@@ -1731,7 +1731,7 @@
if (base)
return base + 1;
- if (isalpha(file_name[0]) && file_name[1] == ':')
+ if (isalpha((int) (unsigned char) file_name[0]) && file_name[1] == ':')
return (char *) file_name + 2;
return (char *) file_name;
diff -r 22d72d45a13a -r 0a24bc154be0 MonetDB4/src/mapi/mapi.mx
--- a/MonetDB4/src/mapi/mapi.mx Fri Jul 23 17:02:10 2010 +0200
+++ b/MonetDB4/src/mapi/mapi.mx Fri Jul 23 18:10:40 2010 +0200
@@ -747,7 +747,7 @@
#ifdef HAVE_SYS_UN_H
struct sockaddr_un userver;
- SOCKET usock = -1;
+ SOCKET usock = INVALID_SOCKET;
#endif
char *usockfile;
socklen_t length = 0;
@@ -859,7 +859,7 @@
if (sock != INVALID_SOCKET)
FD_SET(sock, &fds);
#ifdef HAVE_SYS_UN_H
- if (usock >= 0)
+ if (usock != INVALID_SOCKET)
FD_SET(usock, &fds);
#endif
/* Wait up to 2 seconds. */
diff -r 22d72d45a13a -r 0a24bc154be0 MonetDB4/src/modules/contrib/txtsim.mx
--- a/MonetDB4/src/modules/contrib/txtsim.mxFri Jul 23 17:02:10 2010 +0200
+++ b/MonetDB4/src/modules/contrib/txtsim.mxFri Jul 23 18:10:40 2010 +0200
@@ -275,7 +275,7 @@
/* keep first letter */
Key[0]
MonetDB: default - Merge with Jun2010 branch.
Changeset: 5c61b9a88aed for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5c61b9a88aed Modified Files: Branch: default Log Message: Merge with Jun2010 branch. diffs (21 lines): diff -r 5e0449357195 -r 5c61b9a88aed sql/src/test/BugTracker-2010/Tests/connectto.Bug-2548.stable.err --- a/sql/src/test/BugTracker-2010/Tests/connectto.Bug-2548.stable.err Thu Jul 22 15:42:33 2010 +0200 +++ b/sql/src/test/BugTracker-2010/Tests/connectto.Bug-2548.stable.err Thu Jul 22 16:28:40 2010 +0200 @@ -71,13 +71,13 @@ # 13:12:55 > mclient -lsql -ftest -i -e --host=rig --port=39884 # 13:12:55 > -MAPI = mone...@alviss:32394 +MAPI = mone...@alviss:31044 QUERY = connect to default; ERROR = !CONNECT TO: DEFAULT is not supported! -MAPI = mone...@alviss:32394 +MAPI = mone...@alviss:31044 QUERY = connect to 'whatever' port 50001 database 'nonexisting' USER 'monetdb' PASSWORD 'monetdb' LANGUAGE 'mal'; -ERROR = !IOException:mapi.connect:Could not connect: gethostbyname failed: Unknown host -MAPI = mone...@alviss:32394 +ERROR = !IOException:mapi.connect:Could not connect: getaddrinfo failed: Name or service not known +MAPI = mone...@alviss:31044 QUERY = disconnect 'whatever'; ERROR = !DISCONNECT CATALOG: no such db_alias 'whatever' ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merge with Jun2010 branch.
Changeset: 5e0449357195 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5e0449357195
Modified Files:
buildtools/conf/MonetDB.m4
Branch: default
Log Message:
Merge with Jun2010 branch.
diffs (154 lines):
diff -r 6c53ea638a80 -r 5e0449357195 buildtools/conf/MonetDB.m4
--- a/buildtools/conf/MonetDB.m4Thu Jul 22 14:04:34 2010 +0200
+++ b/buildtools/conf/MonetDB.m4Thu Jul 22 15:42:33 2010 +0200
@@ -1240,7 +1240,7 @@
AC_C_CHAR_UNSIGNED
# Checks for library functions.
-AC_CHECK_FUNCS([ftruncate gettimeofday opendir sysconf times])
+AC_CHECK_FUNCS([ftruncate getaddrinfo gettimeofday opendir sysconf times])
AC_CHECK_FUNCS([madvise posix_fadvise posix_madvise]) dnl gdk_posix.mx
AC_FUNC_FSEEKO()
diff -r 6c53ea638a80 -r 5e0449357195 buildtools/conf/winconfig.h
--- a/buildtools/conf/winconfig.h Thu Jul 22 14:04:34 2010 +0200
+++ b/buildtools/conf/winconfig.h Thu Jul 22 15:42:33 2010 +0200
@@ -54,6 +54,7 @@
#include
#include
#include
+#include
/* Release name or "unreleased" */
#define MONETDB_RELEASE "unreleased"
@@ -163,6 +164,9 @@
/* Does your compiler support function attributes (__attribute__)? */
/* #undef HAVE_FUNCTION_ATTRIBUTES */
+/* Define to 1 if you have the `getaddrinfo' function. */
+#define HAVE_GETADDRINFO 1
+
/* Define to 1 if you have the `getlogin' function. */
/* #undef HAVE_GETLOGIN */
diff -r 6c53ea638a80 -r 5e0449357195 buildtools/conf/winrules.msc
--- a/buildtools/conf/winrules.msc Thu Jul 22 14:04:34 2010 +0200
+++ b/buildtools/conf/winrules.msc Thu Jul 22 15:42:33 2010 +0200
@@ -222,7 +222,7 @@
LIBC_INCS = $(PTHREAD_INCS)
MATH_LIBS =
-SOCKET_LIBS = wsock32.lib
+SOCKET_LIBS = wsock32.lib Ws2_32.lib
MEL=mel.exe
MX=Mx.exe
diff -r 6c53ea638a80 -r 5e0449357195 clients/src/mapilib/Mapi.mx
--- a/clients/src/mapilib/Mapi.mx Thu Jul 22 14:04:34 2010 +0200
+++ b/clients/src/mapilib/Mapi.mx Thu Jul 22 15:42:33 2010 +0200
@@ -2329,13 +2329,6 @@
static MapiMsg
connect_to_server(Mapi mid)
{
- struct sockaddr_in server;
-
-#ifdef HAVE_SYS_UN_H
- struct sockaddr_un userver;
-#endif
- struct sockaddr *serv;
- socklen_t servsize;
SOCKET s;
char errbuf[8096];
@@ -2355,6 +2348,8 @@
struct msghdr msg;
struct iovec vec;
char buf[1];
+ struct sockaddr_un userver;
+ struct sockaddr *serv = (struct sockaddr *) &userver;
if (strlen(mid->hostname) >= sizeof(userver.sun_path)) {
return mapi_setError(mid, "path name too long",
"mapi_reconnect", MERROR);
@@ -2368,11 +2363,9 @@
memset(&userver, 0, sizeof(struct sockaddr_un));
userver.sun_family = AF_UNIX;
strncpy(userver.sun_path, mid->hostname,
sizeof(userver.sun_path));
- serv = (struct sockaddr *) &userver;
- servsize = sizeof(struct sockaddr_un);
s = socket(PF_UNIX, SOCK_STREAM, 0);
- if (connect(s, serv, servsize) < 0) {
+ if (connect(s, serv, sizeof(struct sockaddr_un)) < 0) {
snprintf(errbuf, sizeof(errbuf),
"initiating connection on socket failed: %s",
strerror(errno));
@@ -2399,7 +2392,39 @@
} else
#endif
{
+#ifdef HAVE_GETADDRINFO
+ struct addrinfo hints, *res, *rp;
+ char port[32];
+ int ret;
+
+ if (mid->hostname == NULL)
+ mid->hostname = strdup("localhost");
+ snprintf(port, sizeof(port), "%d", mid->port & 0x);
+
+ memset(&hints, 0, sizeof(hints));
+ hints.ai_family = AF_UNSPEC;
+ hints.ai_socktype = SOCK_STREAM;
+ hints.ai_protocol = IPPROTO_TCP;
+ ret = getaddrinfo(mid->hostname, port, &hints, &res);
+ if (ret) {
+ snprintf(errbuf, sizeof(errbuf), "getaddrinfo failed:
%s", gai_strerror(ret));
+ return mapi_setError(mid, errbuf, "mapi_reconnect",
MERROR);
+ }
+ for (rp = res; rp; rp = rp->ai_next) {
+ s = socket(rp->ai_family, rp->ai_socktype,
rp->ai_protocol);
+ if (s == INVALID_SOCKET)
+ continue;
+ if (connect(s, rp->ai_addr, rp->ai_addrlen) != -1)
+ break; /* success */
+ close(s);
+ }
+ freeaddrinfo(res);
+ if (rp == NULL)
+ return mapi_setError(mid, "could not connect",
"mapi_reconnect", MERROR);
+#else
+ struct sockaddr_in server;
struct hostent *hp;
+ struct sockaddr *serv = (struct sockaddr *) &server;
if (mid->hostname == NUL
MonetDB: default - Merge with Jun2010 branch.
Changeset: 6c53ea638a80 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6c53ea638a80
Modified Files:
Branch: default
Log Message:
Merge with Jun2010 branch.
diffs (200 lines):
diff -r b6cf4d771a87 -r 6c53ea638a80 buildtools/ChangeLog.Jun2010
--- a/buildtools/ChangeLog.Jun2010 Thu Jul 22 11:18:57 2010 +0200
+++ b/buildtools/ChangeLog.Jun2010 Thu Jul 22 14:04:34 2010 +0200
@@ -1,6 +1,10 @@
# ChangeLog file for buildtools
# This file is updated with Maddlog
+* Thu Jul 22 2010 Sjoerd Mullender
+- Changed Maddlog to search up the directory tree to find a ChangeLog
+ file.
+
* Wed Mar 31 2010 Stefan Manegold
- Made compilation of "testing" (and "java") independent of MonetDB.
This is mainly for Windows, but also on other systems, "testing" can
diff -r b6cf4d771a87 -r 6c53ea638a80 buildtools/conf/Maddlog
--- a/buildtools/conf/Maddlog Thu Jul 22 11:18:57 2010 +0200
+++ b/buildtools/conf/Maddlog Thu Jul 22 14:04:34 2010 +0200
@@ -1,49 +1,35 @@
#!/usr/bin/env bash
# -*-shell-script-*-
-d=.
-while [ ! -f $d/vertoo.data ]; do
-if [ $d -ef / ]; then
- echo "$0: cannot find top directory of package" >&2
- exit 1
-fi
-d=../$d
-done
-CL=$d/ChangeLog
-if hg root >& /dev/null ; then
-tag=$(hg branch)
-case $tag in
-default)
- ;;
-*)
- CL=$CL.${tag}
- ;;
-esac
-root=$(hg root)
-root=$(cd $root && \pwd -P)
-dir=$(cd $d && \pwd -P)
-proj=${dir#${root}/}
+usage() {
+cat >&2 <<-EOF
+ $0: unknown option $1
+ Usage: $0 [options] [log message]
+ Valid options are:
+ --logfile=filename (-f filename)
+ --commit
+ If no log message, one will be prompted for.
+ EOF
+exit 1
+}
-PROJECT=${proj%%/*}
-IDENTITY=$(hg showconfig ui.username)
-else
-echo "Cannot use this script outside a Mercurial repository" > /dev/stder
-exit -1
-fi
-
+CL=
nocommit=true
while [ $# -gt 0 ]; do
case "$1" in
---logfile=*)
+--logfile=?*)
CL=${1#--logfile=}
shift
;;
--logfile|-f)
+ if [ $# -lt 2 ]; then
+ usage
+ fi
CL=$2
shift
shift
;;
--f*)
+-f?*)
CL=${1#-f}
shift
;;
@@ -56,13 +42,7 @@
break
;;
-*)
- cat >&2 <<-EOF
- $0: unknown option $1
- Valid options are:
- --logfile=filename (-f filename)
- --commit
- EOF
- exit 1
+ usage
;;
*)
break
@@ -70,6 +50,44 @@
esac
done
+if ! hg root >& /dev/null ; then
+echo "Cannot use this script outside a Mercurial repository" >&2
+exit -1
+fi
+
+tag=$(hg branch)
+
+case "$CL" in
+'')
+d=.
+while [ ! -f $d/vertoo.data -a ! -f $d/ChangeLog -a ! -f $d/ChangeLog.$tag
]; do
+ if [ $d -ef / ]; then
+ echo "$0: cannot find top directory of package" >&2
+ exit 1
+ fi
+ d=../$d
+done
+CL=$d/ChangeLog
+case $tag in
+default)
+ ;;
+*)
+ CL=$CL.${tag}
+ ;;
+esac
+dir=$(cd $d && \pwd -P)
+;;
+*/*)
+dir=$(cd "${CL%/*}"; \pwd -P)
+;;
+*)
+dir=$(\pwd -P)
+;;
+esac
+
+PROJECT=${dir##*/}
+IDENTITY=$(hg showconfig ui.username)
+
if [ $# -gt 0 ]; then
msg=$*
else
diff -r b6cf4d771a87 -r 6c53ea638a80 clients/src/mapilib/Mapi.mx
--- a/clients/src/mapilib/Mapi.mx Thu Jul 22 11:18:57 2010 +0200
+++ b/clients/src/mapilib/Mapi.mx Thu Jul 22 14:04:34 2010 +0200
@@ -2405,7 +2405,7 @@
mid->hostname = strdup("localhost");
if ((hp = gethostbyname(mid->hostname)) == NULL) {
- snprintf(errbuf, sizeof(errbuf), "gethostbyname failed:
%s", strerror(errno));
+ snprintf(errbuf, sizeof(errbuf), "gethostbyname failed:
%s", errno ? strerror(errno) : hstrerror(h_errno));
return mapi_setError(mid, errbuf, "mapi_reconnect",
MERROR);
}
memset(&server, 0, sizeof(server));
diff -r b6cf4d771a87 -r 6c53ea638a80 java/src/nl/cwi/monetdb/jdbc/MonetBlob.java
--- a/java/src/nl/cwi/monetdb/jdbc/MonetBlob.java Thu Jul 22 11:18:57
2010 +0200
+++ b/java/src/nl/cwi/monetdb/jdbc/MonetBlob.java Thu Jul 22 14:04:34
2010 +0200
@@ -39,7 +39,7 @@
int len = in.length() / 2;
buf = new byte[len];
for (int i = 0; i < len; i++)
- buf[i] = Byte.parseByte(in.substring(2 * i, (2 * i) +
2), 16);
+ buf[i] = (byte)Integer.parseInt(in.substring(2 * i, (2
* i) + 2), 16);
}
//== begin interface Blob
diff -r b6cf4d771a87 -r 6c53ea638a80
sql/src/test/BugTracker-2010/Tests/connectto.Bug-2548.stable.err
--- a/sql/src/test/BugTracker-2010/Tests/connectto.Bug-2548.stable.err Thu Jul
22 11:18:57 2010 +0200
+++ b/sql/src/test/BugTracker-2010/Tests/connectto.Bug-2548.stable.e
MonetDB: default - Merge with Jun2010 branch.
Changeset: 106528b5e896 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=106528b5e896 Modified Files: Branch: default Log Message: Merge with Jun2010 branch. diffs (27 lines): diff -r 91e56aa7bc6d -r 106528b5e896 MonetDB4/ChangeLog.Jun2010 --- a/MonetDB4/ChangeLog.Jun2010Thu Jul 22 09:48:43 2010 +0200 +++ b/MonetDB4/ChangeLog.Jun2010Thu Jul 22 09:59:48 2010 +0200 @@ -1,3 +1,8 @@ # ChangeLog file for MonetDB4 # This file is updated with Maddlog +* Thu Jul 22 2010 Sjoerd Mullender +- Slight change to Fedora, Debian, Ubuntu installers: the database + directory now has the group setuid bit set so that new databases + inherit the group ownership (monetdb). + diff -r 91e56aa7bc6d -r 106528b5e896 MonetDB5/ChangeLog.Jun2010 --- a/MonetDB5/ChangeLog.Jun2010Thu Jul 22 09:48:43 2010 +0200 +++ b/MonetDB5/ChangeLog.Jun2010Thu Jul 22 09:59:48 2010 +0200 @@ -1,6 +1,11 @@ # ChangeLog file for MonetDB5 # This file is updated with Maddlog +* Thu Jul 22 2010 Sjoerd Mullender +- Slight change to Fedora, Debian, Ubuntu installers: the database + directory now has the group setuid bit set so that new databases + inherit the group ownership (monetdb). + * Thu Jul 15 2010 Stefan Manegold - restored genuine original mitosis logic by disabling incorrect octopus dominance (even when octopus was not ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merge with Jun2010 branch.
Changeset: 91e56aa7bc6d for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=91e56aa7bc6d
Modified Files:
MonetDB4/MonetDB-server.spec
MonetDB5/MonetDB-server.spec
clients/src/mapiclient/mclient.mx
sql/src/backends/monet5/merovingian/merovingian.c
Branch: default
Log Message:
Merge with Jun2010 branch.
diffs (231 lines):
diff -r 678d0587376a -r 91e56aa7bc6d MonetDB4/MonetDB-server.spec
--- a/MonetDB4/MonetDB-server.spec Wed Jul 21 20:38:53 2010 +0200
+++ b/MonetDB4/MonetDB-server.spec Thu Jul 22 09:48:43 2010 +0200
@@ -136,7 +136,7 @@
make install DESTDIR=$RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/MonetDB
-mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/MonetDB4
+mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/MonetDB4/dbfarm
# insert example db here!
# cleanup stuff we don't want to install
@@ -190,8 +190,9 @@
%{_libdir}/MonetDB4/lib/*.so*
%{_libdir}/MonetDB4/*.mil
-%attr(770,monetdb,monetdb) %dir %{_localstatedir}/MonetDB
-%attr(770,monetdb,monetdb) %dir %{_localstatedir}/MonetDB4
+%attr(750,monetdb,monetdb) %dir %{_localstatedir}/MonetDB
+%attr(2770,monetdb,monetdb) %dir %{_localstatedir}/MonetDB4
+%attr(2770,monetdb,monetdb) %dir %{_localstatedir}/MonetDB4/dbfarm
%config(noreplace) %{_sysconfdir}/MonetDB.conf
diff -r 678d0587376a -r 91e56aa7bc6d MonetDB4/debian/monetdb4-server.dirs
--- a/MonetDB4/debian/monetdb4-server.dirs Wed Jul 21 20:38:53 2010 +0200
+++ b/MonetDB4/debian/monetdb4-server.dirs Thu Jul 22 09:48:43 2010 +0200
@@ -1,1 +1,2 @@
/var/MonetDB4
+/var/MonetDB4/dbfarm
diff -r 678d0587376a -r 91e56aa7bc6d MonetDB4/debian/monetdb4-server.postinst
--- a/MonetDB4/debian/monetdb4-server.postinst Wed Jul 21 20:38:53 2010 +0200
+++ b/MonetDB4/debian/monetdb4-server.postinst Thu Jul 22 09:48:43 2010 +0200
@@ -10,9 +10,9 @@
if ! getent passwd monetdb > /dev/null; then
adduser --system --ingroup monetdb --home /var/lib/monetdb
--disabled-password --shell /usr/sbin/nologin monetdb
fi
- mkdir -p /var/MonetDB4
- chown monetdb:monetdb /var/MonetDB4
- chmod ug=rwx,o= /var/MonetDB4
+ mkdir -p /var/MonetDB4/dbfarm
+ chown monetdb:monetdb /var/MonetDB4 /var/MonetDB4/dbfarm
+ chmod ug=rwx,g+s,o= /var/MonetDB4 /var/MonetDB4/dbfarm
;;
abort-upgrade|abort-remove|abort-deconfigure)
diff -r 678d0587376a -r 91e56aa7bc6d MonetDB5/MonetDB-server.spec
--- a/MonetDB5/MonetDB-server.spec Wed Jul 21 20:38:53 2010 +0200
+++ b/MonetDB5/MonetDB-server.spec Thu Jul 22 09:48:43 2010 +0200
@@ -133,7 +133,7 @@
make install DESTDIR=$RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/MonetDB
-mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/MonetDB5
+mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/MonetDB5/dbfarm
# insert example db here!
# cleanup stuff we don't want to install
@@ -183,8 +183,9 @@
%dir %{_libdir}/MonetDB5/lib
%dir %{_libdir}/MonetDB5/autoload
-%attr(770,monetdb,monetdb) %dir %{_localstatedir}/MonetDB
-%attr(770,monetdb,monetdb) %dir %{_localstatedir}/MonetDB5
+%attr(750,monetdb,monetdb) %dir %{_localstatedir}/MonetDB
+%attr(2770,monetdb,monetdb) %dir %{_localstatedir}/MonetDB5
+%attr(2770,monetdb,monetdb) %dir %{_localstatedir}/MonetDB5/dbfarm
%config(noreplace) %{_sysconfdir}/monetdb5.conf
%{_mandir}/man5/monetdb5.conf.5.gz
diff -r 678d0587376a -r 91e56aa7bc6d MonetDB5/debian/monetdb5-server.dirs
--- a/MonetDB5/debian/monetdb5-server.dirs Wed Jul 21 20:38:53 2010 +0200
+++ b/MonetDB5/debian/monetdb5-server.dirs Thu Jul 22 09:48:43 2010 +0200
@@ -1,1 +1,2 @@
/var/MonetDB5
+/var/MonetDB5/dbfarm
diff -r 678d0587376a -r 91e56aa7bc6d MonetDB5/debian/monetdb5-server.postinst
--- a/MonetDB5/debian/monetdb5-server.postinst Wed Jul 21 20:38:53 2010 +0200
+++ b/MonetDB5/debian/monetdb5-server.postinst Thu Jul 22 09:48:43 2010 +0200
@@ -10,9 +10,9 @@
if ! getent passwd monetdb > /dev/null; then
adduser --system --ingroup monetdb --home /var/lib/monetdb
--disabled-password --shell /usr/sbin/nologin monetdb
fi
- mkdir -p /var/MonetDB5
- chown monetdb:monetdb /var/MonetDB5
- chmod ug=rwx,o= /var/MonetDB5
+ mkdir -p /var/MonetDB5/dbfarm
+ chown monetdb:monetdb /var/MonetDB5 /var/MonetDB5/dbfarm
+ chmod ug=rwx,g+s,o= /var/MonetDB5 /var/MonetDB5/dbfarm
;;
abort-upgrade|abort-remove|abort-deconfigure)
diff -r 678d0587376a -r 91e56aa7bc6d clients/ChangeLog.Jun2010
--- a/clients/ChangeLog.Jun2010 Wed Jul 21 20:38:53 2010 +0200
+++ b/clients/ChangeLog.Jun2010 Thu Jul 22 09:48:43 2010 +0200
@@ -1,6 +1,9 @@
# ChangeLog file for clients
# This file is updated with Maddlog
+* Wed Jul 21 2010 Fabian Groffen
+- Add --version option to mclient.
+
* Tue Jul 20 2010 Sjoerd Mullender
- In case of an incomplete line from the server, add a newline.
This fixes bug 2619.
diff -r 678d0587376a -r 91e56aa7bc6d clients/src/mapiclient/mclient.mx
--- a/c
MonetDB: default - Merge with Jun2010 branch.
Changeset: d10ec9b2709d for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d10ec9b2709d Modified Files: clients/src/mapiclient/mclient.mx Branch: default Log Message: Merge with Jun2010 branch. diffs (17 lines): diff -r cb34dceea691 -r d10ec9b2709d clients/src/mapiclient/mclient.mx --- a/clients/src/mapiclient/mclient.mx Wed Jul 21 15:06:43 2010 +0200 +++ b/clients/src/mapiclient/mclient.mx Wed Jul 21 15:29:52 2010 +0200 @@ -2585,11 +2585,8 @@ stream_printf(toConsole, "Welcome to mclient, the MonetDB%s " - "interactive terminal\n", lang); - if (strcmp(MONETDB_RELEASE, "unreleased") == 0) - stream_printf(toConsole, "Not released\n"); - else - stream_printf(toConsole, "Release %s\n", MONETDB_RELEASE); + "interactive terminal (%s)\n", + lang, MONETDB_RELEASE); if (mode == SQL && (hdl = mapi_query(mid, ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merge with Jun2010 branch.
Changeset: d77fb2ef5c0d for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d77fb2ef5c0d
Modified Files:
buildtools/conf/MonetDB.m4
clients/src/mapiclient/mclient.mx
clients/src/mapiclient/msqldump.c
Branch: default
Log Message:
Merge with Jun2010 branch.
diffs (132 lines):
diff -r 4c233d85c9cf -r d77fb2ef5c0d MonetDB4/src/monet/monet.mx
--- a/MonetDB4/src/monet/monet.mx Wed Jul 21 14:20:10 2010 +0200
+++ b/MonetDB4/src/monet/monet.mx Wed Jul 21 14:50:45 2010 +0200
@@ -411,6 +411,10 @@
out = GDKout;
stream_printf(out, "# MonetDB Server v%s\n", monet_version);
stream_printf(out, "# based on GDK v%s\n", GDKversion());
+ if (strcmp(MONETDB_RELEASE, "unreleased") == 0)
+ stream_printf(out, "# not released\n");
+ else
+ stream_printf(out, "# release %s\n", MONETDB_RELEASE);
stream_printf(out, "# Copyright (c) 1993-July 2008, CWI. "
"All rights reserved.\n");
stream_printf(out, "# Copyright (c) August 2008-2010, MonetDB
B.V.. "
diff -r 4c233d85c9cf -r d77fb2ef5c0d MonetDB4/src/tools/monet_version.c.in
--- a/MonetDB4/src/tools/monet_version.c.in Wed Jul 21 14:20:10 2010 +0200
+++ b/MonetDB4/src/tools/monet_version.c.in Wed Jul 21 14:50:45 2010 +0200
@@ -39,6 +39,10 @@
"based on kernel v%s (" SZFMT "-bit oids)\n",
(size_t) (sizeof(ptr) * 8), GDKversion(),
(size_t) (sizeof(oid) * 8));
+ if (strcmp(MONETDB_RELEASE, "unreleased") == 0)
+ printf("Not released\n");
+ else
+ printf("Release %s\n", MONETDB_RELEASE);
printf("Copyright (c) 1993-July 2008 CWI\nCopyright (c) August
2008-2010 MonetDB B.V., all rights reserved\n");
printf("Visit http://monetdb.cwi.nl/ for further information\n");
printf("Configured for prefix: " MONETDB4_PREFIX "\n");
diff -r 4c233d85c9cf -r d77fb2ef5c0d MonetDB5/src/tools/monet_version.c.in
--- a/MonetDB5/src/tools/monet_version.c.in Wed Jul 21 14:20:10 2010 +0200
+++ b/MonetDB5/src/tools/monet_version.c.in Wed Jul 21 14:50:45 2010 +0200
@@ -46,6 +46,10 @@
"based on kernel v%s (" SZFMT "-bit oids)\n",
(size_t) (sizeof(ptr) * 8), GDKversion(),
(size_t) (sizeof(oid) * 8));
+ if (strcmp(MONETDB_RELEASE, "unreleased") == 0)
+ printf("Not released\n");
+ else
+ printf("Release %s\n", MONETDB_RELEASE);
printf("Copyright (c) 1993-July 2008 CWI\n"
"Copyright (c) August 2008-2010 MonetDB B.V., all
rights reserved\n");
printf("Visit http://monetdb.cwi.nl/ for further information\n");
diff -r 4c233d85c9cf -r d77fb2ef5c0d MonetDB5/src/tools/mserver5.mx
--- a/MonetDB5/src/tools/mserver5.mxWed Jul 21 14:20:10 2010 +0200
+++ b/MonetDB5/src/tools/mserver5.mxWed Jul 21 14:50:45 2010 +0200
@@ -186,6 +186,12 @@
GDKversion());
size -= strlen(s);
s += strlen(s);
+ if (strcmp(MONETDB_RELEASE, "unreleased") == 0)
+ snprintf(s, size, "# Not released\n");
+ else
+ snprintf(s, size, "# Release %s\n", MONETDB_RELEASE);
+ size -= strlen(s);
+ s += strlen(s);
snprintf(s,size,"# Serving database '%s', using %d thread%s\n",
GDKgetenv("gdk_dbname"),
GDKnr_threads, (GDKnr_threads != 1) ? "s" : "");
diff -r 4c233d85c9cf -r d77fb2ef5c0d buildtools/conf/MonetDB.m4
--- a/buildtools/conf/MonetDB.m4Wed Jul 21 14:20:10 2010 +0200
+++ b/buildtools/conf/MonetDB.m4Wed Jul 21 14:50:45 2010 +0200
@@ -54,6 +54,7 @@
;;
esac
+AC_DEFINE(MONETDB_RELEASE, "unreleased", [Release name or "unreleased"])
])
diff -r 4c233d85c9cf -r d77fb2ef5c0d buildtools/conf/winconfig.h
--- a/buildtools/conf/winconfig.h Wed Jul 21 14:20:10 2010 +0200
+++ b/buildtools/conf/winconfig.h Wed Jul 21 14:50:45 2010 +0200
@@ -55,6 +55,9 @@
#include
#include
+/* Release name or "unreleased" */
+#define MONETDB_RELEASE "unreleased"
+
/* indicate to sqltypes.h that windows.h has already been included and
that it doesn't have to define Windows constants */
#define ALREADY_HAVE_WINDOWS_TYPE 1
diff -r 4c233d85c9cf -r d77fb2ef5c0d clients/src/mapiclient/mclient.mx
--- a/clients/src/mapiclient/mclient.mx Wed Jul 21 14:20:10 2010 +0200
+++ b/clients/src/mapiclient/mclient.mx Wed Jul 21 14:50:45 2010 +0200
@@ -2586,6 +2586,10 @@
stream_printf(toConsole,
"Welcome to mclient, the MonetDB%s "
"interactive terminal\n", lang);
+ if (strcmp(MONETDB_RELEASE, "unreleased") == 0)
+ stream_printf(toConsole, "Not released\n");
MonetDB: default - merge with Jun2010 after back-port of bug fix...
Changeset: 5c69faba35f2 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5c69faba35f2 Modified Files: MonetDB5/src/mal/Tests/All MonetDB5/src/mal/mal_resolve.mx Branch: default Log Message: merge with Jun2010 after back-port of bug fix; no actual changes ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merge with Jun2010 branch.
Changeset: afe6f9ab60df for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=afe6f9ab60df
Modified Files:
Branch: default
Log Message:
Merge with Jun2010 branch.
diffs (36 lines):
diff -r 9f5a02f26b86 -r afe6f9ab60df clients/ChangeLog.Jun2010
--- a/clients/ChangeLog.Jun2010 Tue Jul 20 17:31:48 2010 +0200
+++ b/clients/ChangeLog.Jun2010 Tue Jul 20 17:54:06 2010 +0200
@@ -1,3 +1,7 @@
# ChangeLog file for clients
# This file is updated with Maddlog
+* Tue Jul 20 2010 Sjoerd Mullender
+- In case of an incomplete line from the server, add a newline.
+ This fixes bug 2619.
+
diff -r 9f5a02f26b86 -r afe6f9ab60df clients/src/mapilib/Mapi.mx
--- a/clients/src/mapilib/Mapi.mx Tue Jul 20 17:31:48 2010 +0200
+++ b/clients/src/mapilib/Mapi.mx Tue Jul 20 17:54:06 2010 +0200
@@ -3541,13 +3541,18 @@
printf("got next block: length:" SSZFMT "\n", len);
printf("text:%s\n", mid->blk.buf + mid->blk.end);
}
- if (!len) { /* add prompt */
+ if (len == 0) { /* add prompt */
+ if (mid->blk.end > mid->blk.nxt) {
+ /* add fake newline since newline was
+* missing from server */
+ nl = mid->blk.buf + mid->blk.end;
+ *nl = '\n';
+ mid->blk.end++;
+ }
len = 2;
mid->blk.buf[mid->blk.end] = PROMPTBEG;
mid->blk.buf[mid->blk.end + 1] = '\n';
mid->blk.buf[mid->blk.end + 2] = 0;
- if (!nl)
- nl = mid->blk.buf + mid->blk.end + 1;
}
mid->blk.end += (int) len;
}
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merge with Jun2010 branch.
Changeset: a76947a0304a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a76947a0304a
Modified Files:
Branch: default
Log Message:
Merge with Jun2010 branch.
diffs (86 lines):
diff -r be31eb57b206 -r a76947a0304a
sql/src/test/BugTracker-2010/Tests/error-truncated.Bug-2615.stable.err.Windows
--- /dev/null Thu Jan 01 00:00:00 1970 +
+++
b/sql/src/test/BugTracker-2010/Tests/error-truncated.Bug-2615.stable.err.Windows
Tue Jul 20 14:48:59 2010 +0200
@@ -0,0 +1,82 @@
+stderr of test 'error-truncated.Bug-2615` in directory
'src/test/BugTracker-2010` itself:
+
+
+# 17:25:18 >
+# 17:25:18 > mserver5
"--config=/ufs/sjoerd/Monet-virgin-stable/etc/monetdb5.conf" --debug=10 --set
gdk_nr_threads=0 --set
"monet_mod_path=/ufs/sjoerd/Monet-virgin-stable/lib64/MonetDB5:/ufs/sjoerd/Monet-virgin-stable/lib64/MonetDB5/lib:/ufs/sjoerd/Monet-virgin-stable/lib64/MonetDB5/bin"
--set "gdk_dbfarm=/ufs/sjoerd/Monet-virgin-stable/var/MonetDB5/dbfarm" --set
mapi_open=true --set xrpc_open=true --set mapi_port=38866 --set xrpc_port=43109
--set monet_prompt= --set mal_listing=2 --trace
"--dbname=mTests_src_test_BugTracker-2010" --set mal_listing=0 ; echo ; echo
Over..
+# 17:25:18 >
+
+# builtin opt gdk_arch = 64bitx86_64-unknown-linux-gnu
+# builtin opt gdk_version = 1.38.3
+# builtin opt prefix = /ufs/sjoerd/Monet-virgin-stable
+# builtin opt exec_prefix = ${prefix}
+# builtin opt gdk_dbname = demo
+# builtin opt gdk_dbfarm = ${prefix}/var/MonetDB/dbfarm
+# builtin opt gdk_debug = 0
+# builtin opt gdk_alloc_map = no
+# builtin opt gdk_vmtrim = yes
+# builtin opt monet_admin = adm
+# builtin opt monet_prompt = >
+# builtin opt monet_welcome = yes
+# builtin opt monet_mod_path = ${prefix}/lib64/MonetDB
+# builtin opt monet_daemon = no
+# builtin opt host = localhost
+# builtin opt mapi_port = 5
+# builtin opt mapi_clients = 2
+# builtin opt mapi_open = false
+# builtin opt mapi_autosense = false
+# builtin opt sql_debug = 0
+# builtin opt standoff_ns =
+# builtin opt standoff_start = start
+# builtin opt standoff_end = end
+# config opt prefix = /ufs/sjoerd/Monet-virgin-stable
+# config opt config = ${prefix}/etc/monetdb5.conf
+# config opt prefix = /ufs/sjoerd/Monet-virgin-stable
+# config opt exec_prefix = ${prefix}
+# config opt gdk_dbfarm = ${prefix}/var/MonetDB5/dbfarm
+# config opt monet_mod_path =
${prefix}/lib64/MonetDB5:${prefix}/lib64/MonetDB5/lib:${prefix}/lib64/MonetDB5/bin
+# config opt mero_pidfile = ${prefix}/var/run/MonetDB/merovingian.pid
+# config opt mero_controlport = 50001
+# config opt sql_optimizer = default_pipe
+# config opt minimal_pipe = inline,remap,deadcode,multiplex,garbageCollector
+# config opt default_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mitosis,mergetable,deadcode,commonTerms,joinPath,reorder,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# config opt nov2009_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# config opt replication_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,dataflow,history,replication,multiplex,garbageCollector
+# config opt accumulator_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,accumulators,dataflow,history,multiplex,garbageCollector
+# config opt recycler_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,deadcode,constants,commonTerms,joinPath,deadcode,recycle,reduce,dataflow,history,multiplex,garbageCollector
+# config opt cracker_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,selcrack,deadcode,constants,commonTerms,joinPath,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# config opt sidcrack_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,sidcrack,deadcode,constants,commonTerms,joinPath,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# config opt datacell_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,deadcode,constants,commonTerms,joinPath,datacell,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# config opt octopus_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mitosis,mergetable,deadcode,constants,commonTerms,joinPath,octopus,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# config opt mapreduce_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mapreduce,mergetable,deadcode,commonTerms,joinPath,reorder,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# config opt datacyclotron_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,datacyclotron,mergetable,deadcode,constants,commonTerms,joinPath,reorder,deadcode,red
MonetDB: default - Merge with Jun2010 branch.
Changeset: be31eb57b206 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=be31eb57b206
Modified Files:
.hgignore
sql/ChangeLog.Jun2010
sql/src/common/sql_types.mx
sql/src/server/rel_select.mx
Branch: default
Log Message:
Merge with Jun2010 branch.
diffs (truncated from 2020 to 300 lines):
diff -r 8bdb6ffa54c6 -r be31eb57b206 .hgignore
--- a/.hgignore Tue Jul 20 08:38:55 2010 +0200
+++ b/.hgignore Tue Jul 20 14:26:19 2010 +0200
@@ -50,6 +50,8 @@
^java/NT/.*\.jar$
^java/NT/nl/
^java/NT/tests/
+^java/build/
+^java/jars/
^pathfinder/NT/compiler/
^pathfinder/NT/modules/
^pathfinder/NT/runtime/
diff -r 8bdb6ffa54c6 -r be31eb57b206 sql/ChangeLog.Jun2010
--- a/sql/ChangeLog.Jun2010 Tue Jul 20 08:38:55 2010 +0200
+++ b/sql/ChangeLog.Jun2010 Tue Jul 20 14:26:19 2010 +0200
@@ -1,6 +1,10 @@
# ChangeLog file for sql
# This file is updated with Maddlog
+* Tue Jul 20 2010 Sjoerd Mullender
+- Fixed bug 2624: function returning decimal returned result that was
+ scaled incorrectly.
+
* Sun Jul 18 2010 Stefan Manegold
- fixed bug 2622 "LIMIT & OFFSET ignored on 64-bit big-endian when
combined with GROUP BY"
diff -r 8bdb6ffa54c6 -r be31eb57b206 sql/src/common/sql_types.mx
--- a/sql/src/common/sql_types.mx Tue Jul 20 08:38:55 2010 +0200
+++ b/sql/src/common/sql_types.mx Tue Jul 20 14:26:19 2010 +0200
@@ -704,13 +704,12 @@
{
if (strcmp(f->base.name, name) == 0) {
if (list_length(f->ops) == nrargs) {
- int scale = 0;
sql_subfunc *fres = ZNEW(sql_subfunc);
sql_ref_init(&(fres->ref));
fres->func = f;
if (f->res.type)
- sql_init_subtype(&fres->res, f->res.type,
f->res.digits, scale);
+ sql_init_subtype(&fres->res, f->res.type,
f->res.digits, f->res.scale);
if (f->res.comp_type)
fres->res.comp_type = f->res.comp_type;
return fres;
diff -r 8bdb6ffa54c6 -r be31eb57b206 sql/src/server/rel_select.mx
--- a/sql/src/server/rel_select.mx Tue Jul 20 08:38:55 2010 +0200
+++ b/sql/src/server/rel_select.mx Tue Jul 20 14:26:19 2010 +0200
@@ -19,7 +19,7 @@
@f rel_select
@a N.J. Nes
-...@*
+...@*
@h
#ifndef _REL_SELECT_H_
@@ -84,8 +84,8 @@
#include "sql_config.h"
#include "rel_select.h"
-#include "sql_semantic.h" /* TODO this dependency should be removed, move
- the dependend code into sql_mvc */
+#include "sql_semantic.h" /* TODO this dependency should be removed, move
+ the dependent code into sql_mvc */
#include "sql_privileges.h"
#include "sql_env.h"
#include "rel_exp.h"
@@ -99,23 +99,23 @@
#define ERR_AMBIGUOUS 05
sql_rel *
-rel_dup(sql_rel *r)
+rel_dup(sql_rel *r)
{
sql_ref_inc(&r->ref);
return r;
}
-static void
+static void
rel_destroy_(sql_rel *rel)
{
- if (!rel)
+ if (!rel)
return;
if (rel->exps)
list_destroy(rel->exps);
- if (is_join(rel->op) ||
- is_semi(rel->op) ||
- is_select(rel->op) ||
- is_set(rel->op) ||
+ if (is_join(rel->op) ||
+ is_semi(rel->op) ||
+ is_select(rel->op) ||
+ is_set(rel->op) ||
rel->op == op_topn) {
if (rel->l)
rel_destroy(rel->l);
@@ -140,10 +140,10 @@
}
}
-void
+void
rel_destroy(sql_rel *rel)
{
- if (!rel)
+ if (!rel)
return;
if (sql_ref_dec(&rel->ref) > 0)
return;
@@ -169,16 +169,16 @@
}
static void
-rel_setsubquery(sql_rel*r)
+rel_setsubquery(sql_rel*r)
{
if (r->l && !is_base(r->op))
rel_setsubquery(r->l);
- if (r->r && is_join(r->op))
+ if (r->r && is_join(r->op))
rel_setsubquery(r->r);
set_subquery(r);
}
-/* we don't name relations directly, but sometimes we need the relation
+/* we don't name relations directly, but sometimes we need the relation
name. So we look it up in the first expression
*/
char *
@@ -210,7 +210,7 @@
if (is_project(r->op) && r->exps) {
node *ne = r->exps->h;
- for (; ne; ne = ne->next)
+ for (; ne; ne = ne->next)
exp_setname( ne->data, nme, NULL );
}
/* op_projects can have a order by list */
@@ -218,14 +218,14 @@
list *exps = r->r;
node *ne = exps->h;
- for (; ne; ne = ne->next)
+ for (; ne; ne = ne->next)
exp_setname( ne->data, nme, NULL );
}
return r;
}
-static sql_e
MonetDB: default - Merge with Jun2010 branch.
Changeset: d4eb822dfa01 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d4eb822dfa01
Modified Files:
Branch: default
Log Message:
Merge with Jun2010 branch.
diffs (141 lines):
diff -r 8563aa91e7a3 -r d4eb822dfa01 clients/src/odbc/driver/ODBCStmt.h
--- a/clients/src/odbc/driver/ODBCStmt.hMon Jul 19 16:41:53 2010 +0200
+++ b/clients/src/odbc/driver/ODBCStmt.hMon Jul 19 16:42:26 2010 +0200
@@ -80,9 +80,9 @@
set (0 based); rowSetSize is the number of rows in the
current result set; currentRow is the row number of the
current row within the current result set */
- SQLROWOFFSET currentRow;
- SQLROWOFFSET startRow;
- SQLROWOFFSET rowSetSize;
+ SQLLEN currentRow;
+ SQLLEN startRow;
+ SQLLEN rowSetSize;
unsigned int currentCol; /* used by SQLGetData() */
SQLINTEGER retrieved; /* amount of data retrieved */
diff -r 8563aa91e7a3 -r d4eb822dfa01 clients/src/odbc/driver/SQLExtendedFetch.c
--- a/clients/src/odbc/driver/SQLExtendedFetch.cMon Jul 19 16:41:53
2010 +0200
+++ b/clients/src/odbc/driver/SQLExtendedFetch.cMon Jul 19 16:42:26
2010 +0200
@@ -42,8 +42,12 @@
SQLRETURN SQL_API
SQLExtendedFetch(SQLHSTMT hStmt,
SQLUSMALLINT nOrientation,
-SQLROWOFFSET nOffset,
-SQLROWSETSIZE *pnRowCount,
+SQLLEN nOffset,
+#ifdef BUILD_REAL_64_BIT_MODE /* note: only defined on Debian Lenny */
+SQLUINTEGER *pnRowCount,
+#else
+SQLULEN *pnRowCount,
+#endif
SQLUSMALLINT *pRowStatusArray)
{
ODBCStmt *stmt = (ODBCStmt *) hStmt;
@@ -81,8 +85,13 @@
if (SQL_SUCCEEDED(rc) || rc == SQL_NO_DATA)
stmt->State = EXTENDEDFETCHED;
- if (SQL_SUCCEEDED(rc) && pnRowCount)
+ if (SQL_SUCCEEDED(rc) && pnRowCount) {
+#ifdef BUILD_REAL_64_BIT_MODE /* note: only defined on Debian Lenny */
+ *pnRowCount = (SQLUINTEGER) stmt->rowSetSize;
+#else
*pnRowCount = (SQLULEN) stmt->rowSetSize;
+#endif
+ }
return rc;
}
diff -r 8563aa91e7a3 -r d4eb822dfa01 clients/src/odbc/driver/SQLFetch.c
--- a/clients/src/odbc/driver/SQLFetch.cMon Jul 19 16:41:53 2010 +0200
+++ b/clients/src/odbc/driver/SQLFetch.cMon Jul 19 16:42:26 2010 +0200
@@ -77,7 +77,7 @@
updating the SQL_DESC_ARRAY_STATUS_PTR */
stmt->rowSetSize = desc->sql_desc_array_size;
- if (stmt->startRow + stmt->rowSetSize > (SQLROWOFFSET)
stmt->rowcount)
+ if (stmt->startRow + stmt->rowSetSize > (SQLLEN) stmt->rowcount)
stmt->rowSetSize = stmt->rowcount - stmt->startRow;
if (stmt->rowSetSize <= 0) {
@@ -85,7 +85,7 @@
return SQL_NO_DATA;
}
if (statusp) {
- for (row = 0; (SQLROWOFFSET) row < stmt->rowSetSize;
row++)
+ for (row = 0; (SQLLEN) row < stmt->rowSetSize; row++)
*statusp++ = SQL_ROW_SUCCESS;
for (; row < desc->sql_desc_array_size; row++)
*statusp++ = SQL_ROW_NOROW;
diff -r 8563aa91e7a3 -r d4eb822dfa01 clients/src/odbc/driver/SQLFetchScroll.c
--- a/clients/src/odbc/driver/SQLFetchScroll.c Mon Jul 19 16:41:53 2010 +0200
+++ b/clients/src/odbc/driver/SQLFetchScroll.c Mon Jul 19 16:42:26 2010 +0200
@@ -45,7 +45,7 @@
SQLRETURN
SQLFetchScroll_(ODBCStmt *stmt,
SQLSMALLINT FetchOrientation,
- SQLROWOFFSET FetchOffset)
+ SQLLEN FetchOffset)
{
assert(stmt->hdl);
@@ -62,7 +62,7 @@
switch (FetchOrientation) {
case SQL_FETCH_NEXT:
- if (stmt->currentRow >= (SQLROWOFFSET) stmt->rowcount) {
+ if (stmt->currentRow >= (SQLLEN) stmt->rowcount) {
stmt->State = FETCHED;
return SQL_NO_DATA;
}
@@ -84,7 +84,7 @@
stmt->State = FETCHED;
return SQL_NO_DATA;
}
- if (stmt->startRow < (SQLROWOFFSET) RowSetSize) {
+ if (stmt->startRow < (SQLLEN) RowSetSize) {
/* Attempt to fetch before the result set
returned the first rowset */
addStmtError(stmt, "01S06", NULL, 0);
@@ -94,7 +94,7 @@
break;
case SQL_FETCH_RELATIVE:
if ((stmt->currentRow != 0 || FetchOffset <= 0) &&
- (stmt->currentRow != (SQLROWOFFSET) stmt->rowcount ||
FetchOffset >= 0)) {
+ (stmt->currentRow != (SQLLEN) stmt->rowcount || FetchOffset
>= 0)) {
if ((stmt->currentRow == 0 && FetchOffset <= 0) ||
(stmt->startRow == 0 && FetchOffset < 0) ||
MonetDB: default - Merge with Jun2010 branch.
Changeset: b75df91c26f8 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b75df91c26f8
Modified Files:
sql/src/test/BugTracker/Tests/mdb_starts_with_sql_debug_64.SF-1999354.py
Branch: default
Log Message:
Merge with Jun2010 branch.
diffs (248 lines):
diff -r 159f96e96564 -r b75df91c26f8
sql/src/test/BugTracker/Tests/mdb_starts_with_sql_debug_64.SF-1999354.py
--- a/sql/src/test/BugTracker/Tests/mdb_starts_with_sql_debug_64.SF-1999354.py
Mon Jul 19 11:00:48 2010 +0200
+++ b/sql/src/test/BugTracker/Tests/mdb_starts_with_sql_debug_64.SF-1999354.py
Mon Jul 19 11:05:36 2010 +0200
@@ -4,19 +4,27 @@
def server_start(args):
sys.stderr.write('#mserver: "%s"\n' % ' '.join(args))
sys.stderr.flush()
-srv = process.server('sql', args = args, stdin = process.PIPE)
+srv = process.server('sql', args = args, stdin = process.PIPE,
+ stdout = process.PIPE, stderr = process.PIPE)
time.sleep(5) # give server time to start
return srv
def client(lang, file):
sys.stderr.write('#client: "%s"\n' % file)
sys.stderr.flush()
-clt = process.client(lang.lower(), stdin = open(file))
-clt.communicate()
+clt = process.client(lang.lower(), stdin = open(file),
+ stdout = process.PIPE, stderr = process.PIPE)
+return clt.communicate()
def main():
srv = server_start(["--set", "sql_debug=64"])
-client('SQL' , os.path.join(os.getenv('RELSRCDIR'),
'mdb_starts_with_sql_debug_64.SF-1999354.sql'))
-srv.communicate()
+out, err = client('SQL',
+ os.path.join(os.getenv('RELSRCDIR'),
+
'mdb_starts_with_sql_debug_64.SF-1999354.sql'))
+sys.stdout.write(out)
+sys.stderr.write(err)
+out, err = srv.communicate()
+sys.stdout.write(out)
+sys.stderr.write(err)
main()
diff -r 159f96e96564 -r b75df91c26f8
sql/src/test/BugTracker/Tests/set_a_new_user_password.SF-1844050.py
--- a/sql/src/test/BugTracker/Tests/set_a_new_user_password.SF-1844050.py
Mon Jul 19 11:00:48 2010 +0200
+++ b/sql/src/test/BugTracker/Tests/set_a_new_user_password.SF-1844050.py
Mon Jul 19 11:05:36 2010 +0200
@@ -4,27 +4,49 @@
def server_start(lang):
sys.stderr.write('#mserver\n')
sys.stderr.flush()
-srv = process.server(lang, stdin = process.PIPE)
+srv = process.server(lang, stdin = process.PIPE,
+ stdout = process.PIPE, stderr = process.PIPE)
time.sleep(5) # give server time to start
return srv
def client(lang, file, user = 'monetdb', passwd = 'monetdb'):
sys.stderr.write('#client\n')
sys.stderr.flush()
-clt = process.client(lang, user = user, passwd = passwd, stdin =
open(file))
-clt.communicate()
+clt = process.client(lang, user = user, passwd = passwd,
+ stdin = open(file),
+ stdout = process.PIPE, stderr = process.PIPE)
+return clt.communicate()
def main():
srv = server_start('sql')
-client('sql' , os.path.join(os.getenv('RELSRCDIR'),
'set_a_new_user_password.SF-1844050_create_user.sql'))
-srv.communicate()
+out, err = client('sql',
+ os.path.join(os.getenv('RELSRCDIR'),
+
'set_a_new_user_password.SF-1844050_create_user.sql'))
+sys.stdout.write(out)
+sys.stderr.write(err)
+out, err = srv.communicate()
+sys.stdout.write(out)
+sys.stderr.write(err)
srv = server_start('sql')
-client('sql' , os.path.join(os.getenv('RELSRCDIR'),
'set_a_new_user_password.SF-1844050_select.sql'), "voc2", "new")
-srv.communicate()
+out, err = client('sql',
+ os.path.join(os.getenv('RELSRCDIR'),
+
'set_a_new_user_password.SF-1844050_select.sql'),
+ "voc2", "new")
+sys.stdout.write(out)
+sys.stderr.write(err)
+out, err = srv.communicate()
+sys.stdout.write(out)
+sys.stderr.write(err)
srv = server_start('sql')
-client('sql' , os.path.join(os.getenv('RELSRCDIR'),
'set_a_new_user_password.SF-1844050_drop_user.sql'))
-srv.communicate()
+out, err = client('sql',
+ os.path.join(os.getenv('RELSRCDIR'),
+
'set_a_new_user_password.SF-1844050_drop_user.sql'))
+sys.stdout.write(out)
+sys.stderr.write(err)
+out, err = srv.communicate()
+sys.stdout.write(out)
+sys.stderr.write(err)
main()
diff -r 159f96e96564 -r b75df91c26f8
sql/src/test/BugTracker/Tests/set_sql_debug_64__breaking_the_DB.SF-1906287.py
---
a/sql/src/test/BugTracker/Tests/set_sql_debug_64__breaking_the_DB.SF-1906287.py
Mon Jul 19 11:00:48 2010 +0200
+++
b/sql/src/test/BugTracker/Tests/set_sql_debug_64__breaking_the_DB.SF-1906287.py
Mon Jul 19 11:05:36 2010 +0200
@@ -4,24 +4,34 @@
def server_start(args = []):
sys.stde
MonetDB: default - Merge with Jun2010 branch: Test for bug 2624.
Changeset: 24d6620655f2 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=24d6620655f2
Modified Files:
sql/src/test/BugTracker-2010/Tests/All
Branch: default
Log Message:
Merge with Jun2010 branch: Test for bug 2624.
diffs (139 lines):
diff -r 5b0a82a7b1e6 -r 24d6620655f2 sql/src/test/BugTracker-2010/Tests/All
--- a/sql/src/test/BugTracker-2010/Tests/AllMon Jul 19 09:57:01 2010 +0200
+++ b/sql/src/test/BugTracker-2010/Tests/AllMon Jul 19 10:20:54 2010 +0200
@@ -35,3 +35,4 @@
update_statement_in_function_ignored.Bug-2614
error-truncated.Bug-2615
LIMIT_OFFSET_big-endian.Bug-2622
+decimal-function.BUG-2624
diff -r 5b0a82a7b1e6 -r 24d6620655f2
sql/src/test/BugTracker-2010/Tests/decimal-function.BUG-2624.sql
--- /dev/null Thu Jan 01 00:00:00 1970 +
+++ b/sql/src/test/BugTracker-2010/Tests/decimal-function.BUG-2624.sql Mon Jul
19 10:20:54 2010 +0200
@@ -0,0 +1,4 @@
+create function decimal_function(i decimal(10,2)) returns decimal(10,2)
+begin return i; end;
+
+select decimal_function(10);
diff -r 5b0a82a7b1e6 -r 24d6620655f2
sql/src/test/BugTracker-2010/Tests/decimal-function.BUG-2624.stable.err
--- /dev/null Thu Jan 01 00:00:00 1970 +
+++ b/sql/src/test/BugTracker-2010/Tests/decimal-function.BUG-2624.stable.err
Mon Jul 19 10:20:54 2010 +0200
@@ -0,0 +1,78 @@
+stderr of test 'decimal-function.BUG-2624` in directory
'src/test/BugTracker-2010` itself:
+
+
+# 10:17:27 >
+# 10:17:27 > mserver5 "--config=/ufs/sjoerd/Monet-stable/etc/monetdb5.conf"
--debug=10 --set gdk_nr_threads=0 --set
"monet_mod_path=/ufs/sjoerd/Monet-stable/lib64/MonetDB5:/ufs/sjoerd/Monet-stable/lib64/MonetDB5/lib:/ufs/sjoerd/Monet-stable/lib64/MonetDB5/bin"
--set "gdk_dbfarm=/ufs/sjoerd/Monet-stable/var/MonetDB5/dbfarm" --set
mapi_open=true --set xrpc_open=true --set mapi_port=38902 --set xrpc_port=40504
--set monet_prompt= --set mal_listing=2 --trace
"--dbname=mTests_src_test_BugTracker-2010" --set mal_listing=0 ; echo ; echo
Over..
+# 10:17:27 >
+
+# builtin opt gdk_arch = 64bitx86_64-unknown-linux-gnu
+# builtin opt gdk_version = 1.38.4
+# builtin opt prefix = /ufs/sjoerd/Monet-stable
+# builtin opt exec_prefix = ${prefix}
+# builtin opt gdk_dbname = demo
+# builtin opt gdk_dbfarm = ${prefix}/var/MonetDB/dbfarm
+# builtin opt gdk_debug = 0
+# builtin opt gdk_alloc_map = no
+# builtin opt gdk_vmtrim = yes
+# builtin opt monet_admin = adm
+# builtin opt monet_prompt = >
+# builtin opt monet_welcome = yes
+# builtin opt monet_mod_path = ${prefix}/lib64/MonetDB
+# builtin opt monet_daemon = no
+# builtin opt host = localhost
+# builtin opt mapi_port = 5
+# builtin opt mapi_clients = 2
+# builtin opt mapi_open = false
+# builtin opt mapi_autosense = false
+# builtin opt sql_debug = 0
+# builtin opt standoff_ns =
+# builtin opt standoff_start = start
+# builtin opt standoff_end = end
+# config opt prefix = /ufs/sjoerd/Monet-stable
+# config opt config = ${prefix}/etc/monetdb5.conf
+# config opt prefix = /ufs/sjoerd/Monet-stable
+# config opt exec_prefix = ${prefix}
+# config opt gdk_dbfarm = ${prefix}/var/MonetDB5/dbfarm
+# config opt monet_mod_path =
${prefix}/lib64/MonetDB5:${prefix}/lib64/MonetDB5/lib:${prefix}/lib64/MonetDB5/bin
+# config opt mero_pidfile = ${prefix}/var/run/MonetDB/merovingian.pid
+# config opt mero_controlport = 50001
+# config opt sql_optimizer = default_pipe
+# config opt minimal_pipe = inline,remap,deadcode,multiplex,garbageCollector
+# config opt default_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mitosis,mergetable,deadcode,commonTerms,joinPath,reorder,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# config opt nov2009_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# config opt replication_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,dataflow,history,replication,multiplex,garbageCollector
+# config opt accumulator_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,accumulators,dataflow,history,multiplex,garbageCollector
+# config opt recycler_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,deadcode,constants,commonTerms,joinPath,deadcode,recycle,reduce,dataflow,history,multiplex,garbageCollector
+# config opt cracker_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,selcrack,deadcode,constants,commonTerms,joinPath,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# config opt sidcrack_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,sidcrack,deadcode,constants,commonTerms,joinPath,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# config opt datacell_pipe =
inline,rema
MonetDB: default - Merge with Jun2010 branch.
Changeset: 02250651bd9b for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=02250651bd9b Modified Files: Branch: default Log Message: Merge with Jun2010 branch. diffs (16 lines): diff -r fe5e7e1880c3 -r 02250651bd9b buildtools/conf/winrules.msc --- a/buildtools/conf/winrules.msc Fri Jul 16 15:21:03 2010 +0200 +++ b/buildtools/conf/winrules.msc Fri Jul 16 15:27:32 2010 +0200 @@ -91,8 +91,11 @@ LIBPERL = C:\Perl64 !ENDIF !ENDIF +!IFNDEF PERLLIB +PERLLIB = perl510.lib +!ENDIF PERL_INCS = -I$(LIBPERL)\lib\CORE -DWIN32 -PERL_LIBS = $(LIBPERL)\lib\CORE\perl510.lib +PERL_LIBS = $(LIBPERL)\lib\CORE\$(PERLLIB) PERL_LIBDIR = share\MonetDB\perl !ENDIF ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merge with Jun2010 branch.
Changeset: ad27ec744389 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ad27ec744389 Modified Files: sql/src/test/BugTracker-2010/Tests/All Branch: default Log Message: Merge with Jun2010 branch. diffs (9 lines): diff -r fa9942e113cb -r ad27ec744389 sql/src/test/BugTracker-2010/Tests/All --- a/sql/src/test/BugTracker-2010/Tests/AllThu Jul 15 17:28:06 2010 +0200 +++ b/sql/src/test/BugTracker-2010/Tests/AllThu Jul 15 17:31:56 2010 +0200 @@ -33,4 +33,4 @@ ORDER_BY_over_UNION_EXCEPT_INTERSECT.Bug-2606 second_function_existing_signature.Bug-2611 update_statement_in_function_ignored.Bug-2614 -#error-truncated.Bug-2615 +error-truncated.Bug-2615 ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merge with Jun2010 branch.
Changeset: fa9942e113cb for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fa9942e113cb
Modified Files:
Branch: default
Log Message:
Merge with Jun2010 branch.
Approved test for bug 2615.
This is probably the best we can do in the current table reading infrastructure.
diffs (121 lines):
diff -r 86e2a43ce3de -r fa9942e113cb
sql/src/test/BugTracker-2010/Tests/error-truncated.Bug-2615.stable.err
--- /dev/null Thu Jan 01 00:00:00 1970 +
+++ b/sql/src/test/BugTracker-2010/Tests/error-truncated.Bug-2615.stable.err
Thu Jul 15 17:28:06 2010 +0200
@@ -0,0 +1,82 @@
+stderr of test 'error-truncated.Bug-2615` in directory
'src/test/BugTracker-2010` itself:
+
+
+# 17:25:18 >
+# 17:25:18 > mserver5
"--config=/ufs/sjoerd/Monet-virgin-stable/etc/monetdb5.conf" --debug=10 --set
gdk_nr_threads=0 --set
"monet_mod_path=/ufs/sjoerd/Monet-virgin-stable/lib64/MonetDB5:/ufs/sjoerd/Monet-virgin-stable/lib64/MonetDB5/lib:/ufs/sjoerd/Monet-virgin-stable/lib64/MonetDB5/bin"
--set "gdk_dbfarm=/ufs/sjoerd/Monet-virgin-stable/var/MonetDB5/dbfarm" --set
mapi_open=true --set xrpc_open=true --set mapi_port=38866 --set xrpc_port=43109
--set monet_prompt= --set mal_listing=2 --trace
"--dbname=mTests_src_test_BugTracker-2010" --set mal_listing=0 ; echo ; echo
Over..
+# 17:25:18 >
+
+# builtin opt gdk_arch = 64bitx86_64-unknown-linux-gnu
+# builtin opt gdk_version = 1.38.3
+# builtin opt prefix = /ufs/sjoerd/Monet-virgin-stable
+# builtin opt exec_prefix = ${prefix}
+# builtin opt gdk_dbname = demo
+# builtin opt gdk_dbfarm = ${prefix}/var/MonetDB/dbfarm
+# builtin opt gdk_debug = 0
+# builtin opt gdk_alloc_map = no
+# builtin opt gdk_vmtrim = yes
+# builtin opt monet_admin = adm
+# builtin opt monet_prompt = >
+# builtin opt monet_welcome = yes
+# builtin opt monet_mod_path = ${prefix}/lib64/MonetDB
+# builtin opt monet_daemon = no
+# builtin opt host = localhost
+# builtin opt mapi_port = 5
+# builtin opt mapi_clients = 2
+# builtin opt mapi_open = false
+# builtin opt mapi_autosense = false
+# builtin opt sql_debug = 0
+# builtin opt standoff_ns =
+# builtin opt standoff_start = start
+# builtin opt standoff_end = end
+# config opt prefix = /ufs/sjoerd/Monet-virgin-stable
+# config opt config = ${prefix}/etc/monetdb5.conf
+# config opt prefix = /ufs/sjoerd/Monet-virgin-stable
+# config opt exec_prefix = ${prefix}
+# config opt gdk_dbfarm = ${prefix}/var/MonetDB5/dbfarm
+# config opt monet_mod_path =
${prefix}/lib64/MonetDB5:${prefix}/lib64/MonetDB5/lib:${prefix}/lib64/MonetDB5/bin
+# config opt mero_pidfile = ${prefix}/var/run/MonetDB/merovingian.pid
+# config opt mero_controlport = 50001
+# config opt sql_optimizer = default_pipe
+# config opt minimal_pipe = inline,remap,deadcode,multiplex,garbageCollector
+# config opt default_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mitosis,mergetable,deadcode,commonTerms,joinPath,reorder,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# config opt nov2009_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# config opt replication_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,dataflow,history,replication,multiplex,garbageCollector
+# config opt accumulator_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,accumulators,dataflow,history,multiplex,garbageCollector
+# config opt recycler_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,deadcode,constants,commonTerms,joinPath,deadcode,recycle,reduce,dataflow,history,multiplex,garbageCollector
+# config opt cracker_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,selcrack,deadcode,constants,commonTerms,joinPath,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# config opt sidcrack_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,sidcrack,deadcode,constants,commonTerms,joinPath,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# config opt datacell_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,deadcode,constants,commonTerms,joinPath,datacell,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# config opt octopus_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mitosis,mergetable,deadcode,constants,commonTerms,joinPath,octopus,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# config opt mapreduce_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mapreduce,mergetable,deadcode,commonTerms,joinPath,reorder,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# config opt datacyclotron_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,
MonetDB: default - Merge with Jun2010 branch.
Changeset: 86e2a43ce3de for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=86e2a43ce3de
Modified Files:
MonetDB5/src/modules/mal/tablet_sql.mx
Branch: default
Log Message:
Merge with Jun2010 branch.
Fix for bug 2615: truncate value in error message so that line and column can
be seen.
diffs (29 lines):
diff -r 1d972a3c6dae -r 86e2a43ce3de MonetDB5/src/modules/mal/tablet_sql.mx
--- a/MonetDB5/src/modules/mal/tablet_sql.mxThu Jul 15 15:25:27 2010 +0200
+++ b/MonetDB5/src/modules/mal/tablet_sql.mxThu Jul 15 17:11:52 2010 +0200
@@ -166,8 +166,12 @@
char *val;
val = *s ? GDKstrdup(s) : GDKstrdup("");
if ( *err == NULL){
- snprintf(buf,BUFSIZ, "value '%s' from line " BUNFMT
- " field %d not inserted, expecting type %s\n",
val, BATcount(fmt->c[0])+1, col, fmt->type);
+ snprintf(buf, BUFSIZ, "value '%.*s%s' from line "
BUNFMT
+" field %d not inserted, expecting
type %s\n",
+BUFSIZ - 200, val,
+strlen(val) > (size_t) BUFSIZ - 200 ?
"..." : "",
+BATcount(fmt->c[0])+1,
+col, fmt->type);
*err= GDKstrdup(buf);
}
GDKfree(val);
@@ -185,7 +189,9 @@
return ret;
bunins_failed:
if (*err == NULL) {
- snprintf(buf,BUFSIZ, "parsing error from line " BUNFMT " field
%d not inserted\n", BATcount(fmt->c[0])+1, col);
+ snprintf(buf, BUFSIZ, "parsing error from line " BUNFMT
+" field %d not inserted\n",
+BATcount(fmt->c[0])+1, col);
*err= GDKstrdup(buf);
}
return -1;
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merge with Jun2010 branch: Added test for bug...
Changeset: df828b8fc84c for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=df828b8fc84c
Modified Files:
sql/src/test/BugTracker-2010/Tests/All
Branch: default
Log Message:
Merge with Jun2010 branch: Added test for bug 2615.
This test is disabled for now since we first have to decide
what the error message should look like, and then we need to
approve the test output.
Note that the error should happen in the second line of the data.
diffs (34 lines):
diff -r 692eff15bea0 -r df828b8fc84c sql/src/test/BugTracker-2010/Tests/All
--- a/sql/src/test/BugTracker-2010/Tests/AllThu Jul 15 14:41:34 2010 +0200
+++ b/sql/src/test/BugTracker-2010/Tests/AllThu Jul 15 15:09:22 2010 +0200
@@ -33,3 +33,4 @@
ORDER_BY_over_UNION_EXCEPT_INTERSECT.Bug-2606
second_function_existing_signature.Bug-2611
update_statement_in_function_ignored.Bug-2614
+#error-truncated.Bug-2615
diff -r 692eff15bea0 -r df828b8fc84c
sql/src/test/BugTracker-2010/Tests/error-truncated.Bug-2615.sql
--- /dev/null Thu Jan 01 00:00:00 1970 +
+++ b/sql/src/test/BugTracker-2010/Tests/error-truncated.Bug-2615.sql Thu Jul
15 15:09:22 2010 +0200
@@ -0,0 +1,22 @@
+CREATE TABLE "sys"."uitspraken" (
+"id" int NOT NULL,
+"ljn"char(6) NOT NULL,
+"gepubliceerd" boolean NOT NULL,
+"instantie" varchar(63) NOT NULL,
+"datum" date NOT NULL,
+"publicatie" date,
+"zaaknummers"varchar(100) NOT NULL,
+"uitspraak" CHARACTER LARGE OBJECT,
+"conclusie" CHARACTER LARGE OBJECT,
+"zittingsplaats" varchar(16),
+"rechtsgebied" varchar(24),
+"sector" varchar(20),
+"soort" varchar(32),
+"indicatie" CHARACTER LARGE OBJECT,
+"kop"CHARACTER LARGE OBJECT,
+CONSTRAINT "uitspraken_id_pkey" PRIMARY KEY ("id"),
+CONSTRAINT "uitspraken_ljn_unique" UNIQUE ("ljn")
+);
+COPY 2 RECORDS INTO uitspraken FROM STDIN DELIMITERS '\t', '\n' NULL as '';
+277351 AA7351 1 Rechtbank 's-Gravenhage 2000-08-04 AWB
00/6928, 00/6929, 00/6930 Arrondissementsrechtbank te
's-Gravenhage\nzittinghoudende te Haarlem\nfungerend president\nenkelvoudige
kamer voor Vreemdelingenzaken\n\nU I T S P R A A K\n\nartikel 8:81 en 8:86
Algemene Wet Bestuursrecht (Awb)\nartikel 33a, 34a en 34j Vreemdelingenwet
(Vw)\n\nreg.nr: AWB 00/6928 VRWET H (voorlopige voorziening)\nAWB 00/6929 VRWET
H (beroepszaak)\nAWB 00/6930 VRWET H (vrijheidsontneming)\n\ninzake: A, geboren
op [...] 1964, van Iraakse\nnationaliteit, verblijvende in het Grenshospitium
te\nAmsterdam, verzoeker,\ngemachtigde: mr. M.R. van der Linde, advocaat te
Utrecht,\n\ntegen: de Staatssecretaris van Justitie, verweerder,\ngemachtigden:
mr. M. Ramsaroep en mr. T.H.T.W. Zee, werkzaam bij de onder verweerder
ressorterende Immigratie- en Naturalisatiedienst te 's-Gravenhage.\n\n1.
GEGEVENS INZAKE HET GEDING\n\n1.1. Aan de orde is het verzoek om voorlopige
voorziening hangende het beroep van verzoeker tegen de beschikking van
verweerder van 21 juli 2000. Deze beschikking is genomen in het kader van de
zogenoemde AC-procedure en behelst de \nniet-inwilliging van de aanvraag om
toelating als vluchteling en strekt tevens tot het niet verlenen van een
vergunning tot verblijf wegens klemmende redenen van humanitaire aard. Verzocht
wordt om schorsing van de beslissing van \nverweerder om uitzetting niet
achterwege te laten totdat op het beroep tegen voormelde beschikking is
beslist.\n\n1.2 Voorts is aan de orde het beroep gericht tegen de
vrijheidsontnemende maatregel van artikel 7a Vw die verweerder verzoeker met
ingang van 18 juli 2000 heeft opgelegd. Dit beroep strekt tevens tot toekenning
van schadevergoeding. \n\n1.3 De openbare behandeling van de geschillen heeft
plaatsgevonden op 2 augustus 2000. Daarbij hebben verzoeker en verweerder bij
monde van hun gemachtigden hun standpunten nader uiteengezet. Voorts is
verzoeker ter zitting gehoord. \n\n2. OVERWEGINGEN\n\n2.1 Ingevolge artikel
8:81 van de Awb kan, indien tegen een besluit bij de rechtbank beroep is
ingesteld, de president van de rechtbank die bevoegd is in de hoofdzaak op
verzoek een voorlopige voorziening treffen indien onverwijlde \nspoed, gelet
op de betrokken belangen, zulks vereist.\n\n2.2 Op grond van artikel 8:86 van
de Awb heeft de president na behandeling ter zitting van het verzoek om een
voorlopige voorziening de bevoegdheid om, indien hij van oordeel is dat nader
onderzoek redelijkerwijs niet kan bijdragen \naan de beoordeling van de zaak,
onmiddellijk uitspraak te doen in de hoofdzaak. Er bestaat in dit geval
aanleiding om van deze bevoegdheid gebruik te maken.\n\n2.3 De AC-procedure
voorziet in een afdoening van asielaanvragen binnen 48 uur. Deze procedure
leent zich slechts voor die asielaanvragen waaromtrent binnen deze korte
term
MonetDB: default - Merge with Jun2010 branch.
Changeset: 4ba1d6db3236 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4ba1d6db3236
Modified Files:
Branch: default
Log Message:
Merge with Jun2010 branch.
diffs (14 lines):
diff -r c277794da3d5 -r 4ba1d6db3236 buildtools/conf/Maddlog
--- a/buildtools/conf/Maddlog Thu Jul 15 13:55:03 2010 +0200
+++ b/buildtools/conf/Maddlog Thu Jul 15 13:57:42 2010 +0200
@@ -178,7 +178,9 @@
hg add "$CL" >& /dev/null
if [ ! "$nocommit" ]; then
-hg commit -m " $msg" "$CL"
+hg commit -m "${msg//
+ /
+}" "$CL"
else
hg diff "$CL"
echo "Don't forget to COMMIT."
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merge with Jun2010 branch.
Changeset: c277794da3d5 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c277794da3d5 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/MonetDB-SQL.spec testing/MonetDB-testing.spec Branch: default Log Message: Merge with Jun2010 branch. diffs (truncated from 990 to 300 lines): diff -r 3466c419e414 -r c277794da3d5 MonetDB/MonetDB.spec --- a/MonetDB/MonetDB.spec Thu Jul 15 10:43:05 2010 +0200 +++ b/MonetDB/MonetDB.spec Thu Jul 15 13:55:03 2010 +0200 @@ -132,20 +132,20 @@ * Tue Apr 20 2010 Stefan Manegold - 1.38.1-20100618 - Made compilation of "testing" (and "java") independent of MonetDB. - This is mainly for Windows, but also on other systems, "testing" can now be - built independently of (and hence before) "MonetDB". - Files that mimic configure functionality on Windows were moved from - "MonetDB" to "buildtools"; hence, this affects all packages on Windows, - requiring a complete rebuild from scratch on Windows. - getopt() support in testing has changed; hence, (most probably) requiring a - rebuild from scratch of testing on other systems. + This is mainly for Windows, but also on other systems, "testing" can + now be built independently of (and hence before) "MonetDB". Files + that mimic configure functionality on Windows were moved from + "MonetDB" to "buildtools"; hence, this affects all packages on + Windows, requiring a complete rebuild from scratch on Windows. + getopt() support in testing has changed; hence, (most probably) + requiring a rebuild from scratch of testing on other systems. * Tue Apr 20 2010 Stefan Manegold - 1.38.1-20100618 -- Implemented build directory support for Windows, - i.e., like on Unix/Linux also on Windows we can now build in a separate - build directory as alternative to ...NT, and thus keep the - latter clean from files generated during the build. - On Windows, the build directory must be a sibling of ...NT . +- Implemented build directory support for Windows, i.e., like on + Unix/Linux also on Windows we can now build in a separate build + directory as alternative to ...NT, and thus keep the latter + clean from files generated during the build. On Windows, the build + directory must be a sibling of ...NT . * Tue Apr 20 2010 Sjoerd Mullender - 1.36.5-20100420 - Rebuilt. @@ -160,7 +160,8 @@ deleted when the server restarts). * Mon Mar 29 2010 Fabian Groffen - 1.36.5-20100420 -- Fix regression introduced in Feb2010-SP1 causing UDP connections to malfunction, in particular affecting the stethoscope tool. +- Fix regression introduced in Feb2010-SP1 causing UDP connections to + malfunction, in particular affecting the stethoscope tool. * Mon Mar 22 2010 Sjoerd Mullender - 1.36.3-20100322 - Rebuilt. @@ -168,41 +169,41 @@ * Mon Mar 01 2010 Fabian Groffen - 1.36.3-20100322 - Fixed bug in UDP stream creation causing UDP connections to already bound ports to be reported as successful. + * Wed Feb 24 2010 Sjoerd Mullender - 1.36.1-20100224 - Rebuilt. * Mon Feb 22 2010 Sjoerd Mullender - 1.36.1-20100223 - Various concurrency bugs were fixed. -- Various changes were made to run better on systems that don't have enough - memory to keep everything in core that was touched during query processing. - This is done by having the higher layers giving hints to the database - kernel about future use, and the database kernel giving hings to the - operating system kernel about how (virtual) memory is going to be used. +- Various changes were made to run better on systems that don't have + enough memory to keep everything in core that was touched during + query processing. This is done by having the higher layers giving + hints to the database kernel about future use, and the database + kernel giving hings to the operating system kernel about how + (virtual) memory is going to be used. * Thu Feb 18 2010 Stefan Manegold - 1.36.1-20100223 -- Fixed bug in mergejoin implementation. - This fixes bug #2952191. +- Fixed bug in mergejoin implementation. This fixes bug #2952191. * Tue Feb 2 2010 Sjoerd Mullender - 1.36.1-20100223 - Added support for compiling on Windows using the Cygwin-provided version of flex. * Thu Jan 21 2010 Sjoerd Mullender - 1.36.1-20100223 -- Fix compilation issue when configured with --with-curl. - This fixes bug #2924999. +- Fix compilation issue when configured with --with-curl. This fixes + bug #2924999. * Thu Jan 21 2010 Fabian Groffen - 1.36.1-20100223 - Added implementation of MT_getrss() for Solaris. This yields in the kernel knowing about its (approximate) memory usage to try and help - the operating system to free that memory that is best to free, instead - of a random page, e.g. the work of the vmtrim thread. + the operating system t
MonetDB: default - Merge with Jun2010 branch: s/mo...@cwi.nl/inf...
Changeset: 713e92afed0d for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=713e92afed0d Modified Files: MonetDB/configure.ag MonetDB4/configure.ag MonetDB5/configure.ag buildtools/configure.ac clients/configure.ag geom/configure.ag java/configure.ag pathfinder/configure.ag python/setup.py sql/configure.ag template/configure.ag testing/configure.ag Branch: default Log Message: Merge with Jun2010 branch: s/mo...@cwi.nl/i...@monetdb.org/ diffs (truncated from 421 to 300 lines): diff -r be790c3f0fc1 -r 713e92afed0d MonetDB/HowToStart.rst --- a/MonetDB/HowToStart.rstWed Jul 14 14:43:36 2010 +0200 +++ b/MonetDB/HowToStart.rstWed Jul 14 15:07:45 2010 +0200 @@ -557,7 +557,7 @@ Bugs and other problems with compiling or running MonetDB should be reported using our `bug tracking system`__ (preferred) or -emailed to mo...@cwi.nl. Please make sure that you give a *detailed* +emailed to i...@monetdb.org. Please make sure that you give a *detailed* description of your problem! __ http://bugs.monetdb.org/ diff -r be790c3f0fc1 -r 713e92afed0d MonetDB/NT/website.html --- a/MonetDB/NT/website.html Wed Jul 14 14:43:36 2010 +0200 +++ b/MonetDB/NT/website.html Wed Jul 14 15:07:45 2010 +0200 @@ -30,7 +30,7 @@ -mailto:mo...@cwi.nl";>The MonetDB Team +mailto:i...@monetdb.org";>The MonetDB Team Last modified: Thu Jun 22 11:31:27 WEDT 2006 diff -r be790c3f0fc1 -r 713e92afed0d MonetDB/configure.ag --- a/MonetDB/configure.ag Wed Jul 14 14:43:36 2010 +0200 +++ b/MonetDB/configure.ag Wed Jul 14 15:07:45 2010 +0200 @@ -20,7 +20,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.60) -AC_INIT([MonetDB Common], [1.39.0], [mo...@cwi.nl], [MonetDB]) +AC_INIT([MonetDB Common], [1.39.0], [i...@monetdb.org], [MonetDB]) # ^^ # Maintained via vertoo. Please don't modify by hand! # Contact monetdb-develop...@lists.sourceforge.net for details and/or assistance. diff -r be790c3f0fc1 -r 713e92afed0d MonetDB/debian/control --- a/MonetDB/debian/controlWed Jul 14 14:43:36 2010 +0200 +++ b/MonetDB/debian/controlWed Jul 14 15:07:45 2010 +0200 @@ -1,7 +1,7 @@ Source: monetdb Section: misc Priority: extra -Maintainer: MonetDB BV +Maintainer: MonetDB BV Build-Depends: debhelper (>= 5), autotools-dev, zlib1g-dev, libbz2-dev, libssl-dev, cdbs Standards-Version: 3.8.0 diff -r be790c3f0fc1 -r 713e92afed0d MonetDB4/configure.ag --- a/MonetDB4/configure.ag Wed Jul 14 14:43:36 2010 +0200 +++ b/MonetDB4/configure.ag Wed Jul 14 15:07:45 2010 +0200 @@ -19,7 +19,7 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ(2.60) -AC_INIT([MonetDB Server], [4.39.0], [mo...@cwi.nl], [MonetDB4-server]) +AC_INIT([MonetDB Server], [4.39.0], [i...@monetdb.org], [MonetDB4-server]) # ^^ # Maintained via vertoo. Please don't modify by hand! # Contact monetdb-develop...@lists.sourceforge.net for details and/or assistance. diff -r be790c3f0fc1 -r 713e92afed0d MonetDB4/debian/control --- a/MonetDB4/debian/control Wed Jul 14 14:43:36 2010 +0200 +++ b/MonetDB4/debian/control Wed Jul 14 15:07:45 2010 +0200 @@ -1,7 +1,7 @@ Source: monetdb4-server Section: misc Priority: extra -Maintainer: MonetDB BV +Maintainer: MonetDB BV Build-Depends: debhelper (>= 5), cdbs, autotools-dev, libpcre3-dev, libmonetdb-dev, libmonetdb-client-dev Standards-Version: 3.8.0 diff -r be790c3f0fc1 -r 713e92afed0d MonetDB4/website.html --- a/MonetDB4/website.html Wed Jul 14 14:43:36 2010 +0200 +++ b/MonetDB4/website.html Wed Jul 14 15:07:45 2010 +0200 @@ -30,7 +30,7 @@ -mailto:mo...@cwi.nl";>The MonetDB Team +mailto:i...@monetdb.org";>The MonetDB Team Last modified: Thu Jun 22 11:31:27 WEDT 2006 diff -r be790c3f0fc1 -r 713e92afed0d MonetDB5/configure.ag --- a/MonetDB5/configure.ag Wed Jul 14 14:43:36 2010 +0200 +++ b/MonetDB5/configure.ag Wed Jul 14 15:07:45 2010 +0200 @@ -20,7 +20,7 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ(2.60) -AC_INIT([MonetDB Server], [5.21.0], [mo...@cwi.nl], [MonetDB5-server]) +AC_INIT([MonetDB Server], [5.21.0], [i...@monetdb.org], [MonetDB5-server]) # ^ # Maintained via vertoo. Please don't modify by hand! # Contact monetdb-develop...@lists.sourceforge.net for details and/or assistance. diff -r be790c3f0fc1 -r 713e92afed0d MonetDB5/debian/control --- a/MonetDB5/debian/control Wed Jul 14 14:43:36 2010 +0200 +++ b/MonetDB5/debian/control Wed Jul 14 15:07:45 2010 +0200 @@ -1,7 +1,7 @@ Source: monetdb5-server Section: misc Priority: extra -Maintainer: MonetDB BV +Maintainer: MonetDB BV Build-Depends: debhelper (>= 5), autotools-dev, libpcre3-dev, libssl-dev, libraptor1-dev, libxml2-dev, libmonetdb-dev, libmonetdb-client-dev, cdbs Sta
MonetDB: default - Merge with Jun2010 branch.
Changeset: 091e939109be for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=091e939109be Modified Files: Branch: default Log Message: Merge with Jun2010 branch. diffs (42 lines): diff -r f5213232e57d -r 091e939109be sql/src/benchmarks/ATIS/Tests/select_simple_join.sql --- a/sql/src/benchmarks/ATIS/Tests/select_simple_join.sql Wed Jul 14 11:01:30 2010 +0200 +++ b/sql/src/benchmarks/ATIS/Tests/select_simple_join.sql Wed Jul 14 11:08:54 2010 +0200 @@ -1,5 +1,5 @@ select city.city_name,state.state_name,city.city_code from city,state where city.city_code='MATL' and city.state_code=state.state_code; -select city.city_name,state.state_name,city.city_code from state,city where city.state_code=state.state_code; -select month_name.month_name,day_name.day_name from month_name,day_name where month_name.month_number=day_name.day_code; -select month_name.month_name,day_name.day_name from month_name,day_name where month_name.month_number=day_name.day_code and day_name.day_code >= 4; +select city.city_name,state.state_name,city.city_code from state,city where city.state_code=state.state_code order by city.city_name,state.state_name; +select month_name.month_name,day_name.day_name from month_name,day_name where month_name.month_number=day_name.day_code order by month_name.month_number; +select month_name.month_name,day_name.day_name from month_name,day_name where month_name.month_number=day_name.day_code and day_name.day_code >= 4 order by month_name.month_number; select flight.flight_code,aircraft.aircraft_type from flight,aircraft where flight.aircraft_code=aircraft.aircraft_code order by flight.flight_code; diff -r f5213232e57d -r 091e939109be sql/src/benchmarks/ATIS/Tests/select_simple_join.stable.out --- a/sql/src/benchmarks/ATIS/Tests/select_simple_join.stable.out Wed Jul 14 11:01:30 2010 +0200 +++ b/sql/src/benchmarks/ATIS/Tests/select_simple_join.stable.out Wed Jul 14 11:08:54 2010 +0200 @@ -32,17 +32,18 @@ % city_name, state_name, city_code # name % char,char, char # type % 25, 25, 4 # length +[ "ATLANTA", "GEORGIA", "MATL" ] +[ "BALTIMORE", "MARYLAND", "BBWI" ] +[ "BOSTON","MASSACHUSETTS","BBOS" ] +[ "DALLAS","TEXAS","DDFW" ] +[ "DENVER","COLORADO", "DDEN" ] +[ "FORT WORTH","TEXAS","FDFW" ] [ "OAKLAND", "CALIFORNIA", "OOAK" ] +[ "PHILADELPHIA", "PENNSYLVANIA", "PPHL" ] +[ "PITTSBURGH","PENNSYLVANIA", "PPIT" ] [ "SAN FRANCISCO", "CALIFORNIA", "SSFO" ] -[ "DENVER","COLORADO", "DDEN" ] [ "WASHINGTON","DISTRICT OF COLUMBIA", "WWAS" ] -[ "ATLANTA", "GEORGIA", "MATL" ] -[ "BOSTON","MASSACHUSETTS","BBOS" ] -[ "BALTIMORE", "MARYLAND", "BBWI" ] -[ "PITTSBURGH","PENNSYLVANIA", "PPIT" ] -[ "PHILADELPHIA", "PENNSYLVANIA", "PPHL" ] -[ "FORT WORTH","TEXAS","FDFW" ] -[ "DALLAS","TEXAS","DDFW" ] +#select month_name.month_name,day_name.day_name from month_name,day_name where month_name.month_number=day_name.day_code; % sys.month_name, sys.day_name # table_name % month_name, day_name # name % char,char # type ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - merge with Jun2010 (no actual changes)
Changeset: f5213232e57d for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f5213232e57d Modified Files: sql/src/test/BugTracker-2010/Tests/All Branch: default Log Message: merge with Jun2010 (no actual changes) ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merge with Jun2010 branch.
Changeset: bdcb528a500b for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=bdcb528a500b Modified Files: Branch: default Log Message: Merge with Jun2010 branch. diffs (48 lines): diff -r fdb07071159e -r bdcb528a500b MonetDB4/tests/from_Twente/moa/Tests/list.milS --- a/MonetDB4/tests/from_Twente/moa/Tests/list.milSWed Jul 14 10:40:43 2010 +0200 +++ b/MonetDB4/tests/from_Twente/moa/Tests/list.milSWed Jul 14 10:52:24 2010 +0200 @@ -954,7 +954,7 @@ _MMjoin_10 := join(indexA,_MMmirror_9); _MMreverse_11 := reverse(_MMmirror_9); _MMreverse_12 := reverse(valuesC); -_MMjoin_13 := join(valuesA,_MMreverse_12); +_MMjoin_13 := join(valuesA,_MMreverse_12).sort_ht(); _MMcastnil_14 := _MMjoin_13.mark(0...@0); _MMjoin_15 := join(_MMreverse_11,_MMcastnil_14); var _MMcastnil_16 := _MMjoin_15.mark(0...@0); diff -r fdb07071159e -r bdcb528a500b MonetDB4/tests/from_Twente/moa/Tests/list.stable.out --- a/MonetDB4/tests/from_Twente/moa/Tests/list.stable.out Wed Jul 14 10:40:43 2010 +0200 +++ b/MonetDB4/tests/from_Twente/moa/Tests/list.stable.out Wed Jul 14 10:52:24 2010 +0200 @@ -2182,7 +2182,7 @@ _MMjoin_10 := join(indexA,_MMmirror_9); _MMreverse_11 := reverse(_MMmirror_9); _MMreverse_12 := reverse(valuesC); -_MMjoin_13 := join(valuesA,_MMreverse_12); +_MMjoin_13 := join(valuesA,_MMreverse_12).sort_ht(); _MMcastnil_14 := _MMjoin_13.mark(0...@0); _MMjoin_15 := join(_MMreverse_11,_MMcastnil_14); var _MMcastnil_16 := _MMjoin_15.mark(0...@0); diff -r fdb07071159e -r bdcb528a500b MonetDB4/tests/from_Twente/moa/Tests/test.milS --- a/MonetDB4/tests/from_Twente/moa/Tests/test.milSWed Jul 14 10:40:43 2010 +0200 +++ b/MonetDB4/tests/from_Twente/moa/Tests/test.milSWed Jul 14 10:52:24 2010 +0200 @@ -968,7 +968,7 @@ var _MMreverse_11 := reverse(_MMjoin_10); var _MMnilcast_12 := _MMreverse_11.reverse().mark(0...@0).reverse(); var _MMjoin_13 := join(_MMnilcast_9,valuesD); -var _MMnilcast_14 := _MMjoin_7.reverse().mark(0...@0).reverse(); +var _MMnilcast_14 := _MMjoin_7s.reverse().mark(0...@0).reverse(); _MMnilcast_14.sort_ht().print(); var _MMjoin_15 := join(_MMnilcast_14,indexB); _MMjoin_15.sort_ht().print(); diff -r fdb07071159e -r bdcb528a500b MonetDB4/tests/from_Twente/moa/Tests/test.stable.out --- a/MonetDB4/tests/from_Twente/moa/Tests/test.stable.out Wed Jul 14 10:40:43 2010 +0200 +++ b/MonetDB4/tests/from_Twente/moa/Tests/test.stable.out Wed Jul 14 10:52:24 2010 +0200 @@ -2354,7 +2354,7 @@ var _MMreverse_11 := reverse(_MMjoin_10); var _MMnilcast_12 := _MMreverse_11.reverse().mark(0...@0).reverse(); var _MMjoin_13 := join(_MMnilcast_9,valuesD); -var _MMnilcast_14 := _MMjoin_7.reverse().mark(0...@0).reverse(); +var _MMnilcast_14 := _MMjoin_7s.reverse().mark(0...@0).reverse(); _MMnilcast_14.sort_ht().print(); #-# # BAT: tmp_56 # ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - merge with Jun2010
Changeset: ce68c69896ea for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ce68c69896ea Modified Files: sql/src/test/BugTracker-2010/Tests/All Branch: default Log Message: merge with Jun2010 diffs (9 lines): diff -r 8453b0f67e3a -r ce68c69896ea sql/src/test/BugTracker-2010/Tests/All --- a/sql/src/test/BugTracker-2010/Tests/AllTue Jul 13 18:51:26 2010 +0200 +++ b/sql/src/test/BugTracker-2010/Tests/AllWed Jul 14 07:43:30 2010 +0200 @@ -30,4 +30,4 @@ predicate_in_select.Bug-2535 subselect.Bug-2537 group-by_ordered_column.Bug-2564 -ORDER_BY_over_UNION_EXCET_INTERSECT.Bug-2606 +ORDER_BY_over_UNION_EXCEPT_INTERSECT.Bug-2606 ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merge with Jun2010 branch.
Changeset: 67dfe6ab482e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=67dfe6ab482e
Modified Files:
Branch: default
Log Message:
Merge with Jun2010 branch.
diffs (16 lines):
diff -r 5af5f1b63e0a -r 67dfe6ab482e testing/src/process.py
--- a/testing/src/process.pyTue Jul 13 11:51:14 2010 +0200
+++ b/testing/src/process.pyTue Jul 13 13:11:39 2010 +0200
@@ -35,9 +35,9 @@
del command[0]
return command
-_mil_client = splitcommand(os.getenv('MIL_CLIENT', 'mclient -lmil -i'))
-_mal_client = splitcommand(os.getenv('MAL_CLIENT', 'mclient -lmal -i'))
-_sql_client = splitcommand(os.getenv('SQL_CLIENT', 'mclient -lsql -i'))
+_mil_client = splitcommand(os.getenv('MIL_CLIENT', 'mclient -lmil'))
+_mal_client = splitcommand(os.getenv('MAL_CLIENT', 'mclient -lmal'))
+_sql_client = splitcommand(os.getenv('SQL_CLIENT', 'mclient -lsql'))
_xquery_client = splitcommand(os.getenv('XQUERY_CLIENT', 'mclient -lxquery
-fxml'))
_sql_dump = splitcommand(os.getenv('SQL_DUMP', 'msqldump'))
_server = splitcommand(os.getenv('MSERVER', ''))
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - merge with Jun2010
Changeset: 37ce5d055a57 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=37ce5d055a57
Modified Files:
sql/src/test/BugTracker-2010/Tests/All
Branch: default
Log Message:
merge with Jun2010
diffs (truncated from 518 to 300 lines):
diff -r 11489b108f40 -r 37ce5d055a57 sql/src/test/BugTracker-2010/Tests/All
--- a/sql/src/test/BugTracker-2010/Tests/AllTue Jul 13 11:23:16 2010 +0200
+++ b/sql/src/test/BugTracker-2010/Tests/AllTue Jul 13 11:47:39 2010 +0200
@@ -30,3 +30,4 @@
predicate_in_select.Bug-2535
subselect.Bug-2537
group-by_ordered_column.Bug-2564
+ORDER_BY_over_UNION_EXCET_INTERSECT.Bug-2606
diff -r 11489b108f40 -r 37ce5d055a57
sql/src/test/BugTracker-2010/Tests/ORDER_BY_over_UNION_EXCEPT_INTERSECT.Bug-2606.sql
--- /dev/null Thu Jan 01 00:00:00 1970 +
+++
b/sql/src/test/BugTracker-2010/Tests/ORDER_BY_over_UNION_EXCEPT_INTERSECT.Bug-2606.sql
Tue Jul 13 11:47:39 2010 +0200
@@ -0,0 +1,55 @@
+create table t2606a (a int);
+insert into t2606a values (11);
+insert into t2606a values (21);
+insert into t2606a values (13);
+insert into t2606a values (23);
+insert into t2606a values (12);
+insert into t2606a values (22);
+create table t2606b (a int);
+insert into t2606b values (21);
+insert into t2606b values (31);
+insert into t2606b values (23);
+insert into t2606b values (33);
+insert into t2606b values (22);
+insert into t2606b values (32);
+select * from t2606a;
+select * from t2606b;
+
+-- ORDER BY is ignored:
+
+plan select * from t2606a union select * from t2606b order by a;
+ select * from t2606a union select * from t2606b order by a;
+plan ( select * from t2606a union select * from t2606b ) order by a;
+ ( select * from t2606a union select * from t2606b ) order by a;
+plan ( select * from t2606a ) union ( select * from t2606b ) order by a;
+ ( select * from t2606a ) union ( select * from t2606b ) order by a;
+
+plan select * from t2606a except select * from t2606b order by a;
+ select * from t2606a except select * from t2606b order by a;
+plan ( select * from t2606a except select * from t2606b ) order by a;
+ ( select * from t2606a except select * from t2606b ) order by a;
+plan ( select * from t2606a ) except ( select * from t2606b ) order by a;
+ ( select * from t2606a ) except ( select * from t2606b ) order by a;
+
+plan select * from t2606a intersect select * from t2606b order by a;
+ select * from t2606a intersect select * from t2606b order by a;
+plan ( select * from t2606a intersect select * from t2606b ) order by a;
+ ( select * from t2606a intersect select * from t2606b ) order by a;
+plan ( select * from t2606a ) intersect ( select * from t2606b ) order by a;
+ ( select * from t2606a ) intersect ( select * from t2606b ) order by a;
+
+-- ORDER BY is respected:
+
+plan select * from (select * from t2606a union select * from t2606b) as t
order by a;
+ select * from (select * from t2606a union select * from t2606b) as t
order by a;
+
+plan select * from (select * from t2606a except select * from t2606b) as t
order by a;
+ select * from (select * from t2606a except select * from t2606b) as t
order by a;
+
+plan select * from (select * from t2606a intersect select * from t2606b) as t
order by a;
+ select * from (select * from t2606a intersect select * from t2606b) as t
order by a;
+
+-- clean-up
+
+drop table t2606b;
+drop table t2606a;
diff -r 11489b108f40 -r 37ce5d055a57
sql/src/test/BugTracker-2010/Tests/ORDER_BY_over_UNION_EXCEPT_INTERSECT.Bug-2606.stable.err
--- /dev/null Thu Jan 01 00:00:00 1970 +
+++
b/sql/src/test/BugTracker-2010/Tests/ORDER_BY_over_UNION_EXCEPT_INTERSECT.Bug-2606.stable.err
Tue Jul 13 11:47:39 2010 +0200
@@ -0,0 +1,78 @@
+stderr of test 'ORDER_BY_over_UNION_EXCEPT_INTERSECT.Bug-2606` in directory
'src/test/BugTracker-2010` itself:
+
+
+# 11:27:31 >
+# 11:27:31 > mserver5
"--config=/ufs/manegold/_/scratch0/Monet/HG/Jun2010/prefix./etc/monetdb5.conf"
--debug=10 --set gdk_nr_threads=1 --set
"monet_mod_path=/ufs/manegold/_/scratch0/Monet/HG/Jun2010/prefix./lib64/MonetDB5:/ufs/manegold/_/scratch0/Monet/HG/Jun2010/prefix./lib64/MonetDB5/lib:/ufs/manegold/_/scratch0/Monet/HG/Jun2010/prefix./lib64/MonetDB5/bin"
--set
"gdk_dbfarm=/ufs/manegold/_/scratch0/Monet/HG/Jun2010/prefix./var/MonetDB5/dbfarm"
--set mapi_open=true --set xrpc_open=true --set mapi_port=30498 --set
xrpc_port=41224 --set monet_prompt= --set mal_listing=2 --trace
"--dbname=mTests_src_test_BugTracker-2010" --set mal_listing=0 ; echo ; echo
Over..
+# 11:27:31 >
+
+# builtin opt gdk_arch = 64bitx86_64-unknown-linux-gnu
+# builtin opt gdk_version = 1.38.3
+# builtin opt prefix = /ufs/manegold/_/scratch0/Monet/HG/Jun2010/prefix.
+# builtin opt exec_prefix = ${prefix}
+# builtin opt gdk_dbname = demo
+# builtin opt gdk_dbfarm = ${prefix}/var/MonetDB/dbfarm
+# builtin opt gdk_debug = 0
+# builtin opt
MonetDB: default - Merge with Jun2010 branch.
Changeset: 11489b108f40 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=11489b108f40
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/MonetDB-SQL.spec
sql/NT/MonetDB5-SQL/MonetDB5-SQL-Installer.vdproj
sql/NT/MonetDB5-SQL64/MonetDB5-SQL-Installer.vdproj
testing/MonetDB-testing.spec
Branch: default
Log Message:
Merge with Jun2010 branch.
diffs (239 lines):
diff -r 084dad091d4a -r 11489b108f40 .hgtags
--- a/.hgtags Tue Jul 13 10:54:12 2010 +0200
+++ b/.hgtags Tue Jul 13 11:23:16 2010 +0200
@@ -419,3 +419,5 @@
e4fe1c3cabfee2bba0b620aee6c3e9d569d37e17 Jun2010_3
e4fe1c3cabfee2bba0b620aee6c3e9d569d37e17 Jun2010_3
9aa479df22dda265b8c685f9e15b0899244b0184 Jun2010_3
+9aa479df22dda265b8c685f9e15b0899244b0184 Jun2010_3
+a6dd584e5bee4d0ec428e6aade193c263c55cdb3 Jun2010_3
diff -r 084dad091d4a -r 11489b108f40 MonetDB/MonetDB.spec
--- a/MonetDB/MonetDB.spec Tue Jul 13 10:54:12 2010 +0200
+++ b/MonetDB/MonetDB.spec Tue Jul 13 11:23:16 2010 +0200
@@ -106,6 +106,9 @@
%{_libdir}/libbat.so
%changelog
+* Tue Jul 13 2010 Sjoerd Mullender - 1.38.3-20100713
+- Rebuilt.
+
* Mon Jul 12 2010 Sjoerd Mullender - 1.38.3-20100712
- Rebuilt.
diff -r 084dad091d4a -r 11489b108f40 MonetDB/debian/changelog
--- a/MonetDB/debian/changelog Tue Jul 13 10:54:12 2010 +0200
+++ b/MonetDB/debian/changelog Tue Jul 13 11:23:16 2010 +0200
@@ -1,3 +1,9 @@
+monetdb (1.38.3-20100713) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender Tue, 13 Jul 2010 11:17:24 +0200
+
monetdb (1.38.3-20100712) unstable; urgency=low
* Rebuilt.
diff -r 084dad091d4a -r 11489b108f40 MonetDB4/MonetDB-server.spec
--- a/MonetDB4/MonetDB-server.spec Tue Jul 13 10:54:12 2010 +0200
+++ b/MonetDB4/MonetDB-server.spec Tue Jul 13 11:23:16 2010 +0200
@@ -216,6 +216,9 @@
%{_libdir}/libembeddedmil.so
%changelog
+* Tue Jul 13 2010 Sjoerd Mullender - 4.38.3-20100713
+- Rebuilt.
+
* Mon Jul 12 2010 Sjoerd Mullender - 4.38.3-20100712
- Rebuilt.
diff -r 084dad091d4a -r 11489b108f40 MonetDB4/debian/changelog
--- a/MonetDB4/debian/changelog Tue Jul 13 10:54:12 2010 +0200
+++ b/MonetDB4/debian/changelog Tue Jul 13 11:23:16 2010 +0200
@@ -1,3 +1,9 @@
+monetdb4-server (4.38.3-20100713) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender Tue, 13 Jul 2010 11:17:24 +0200
+
monetdb4-server (4.38.3-20100712) unstable; urgency=low
* Rebuilt.
diff -r 084dad091d4a -r 11489b108f40 MonetDB5/ChangeLog.Jun2010
--- a/MonetDB5/ChangeLog.Jun2010Tue Jul 13 10:54:12 2010 +0200
+++ b/MonetDB5/ChangeLog.Jun2010Tue Jul 13 11:23:16 2010 +0200
@@ -1,7 +1,3 @@
# ChangeLog file for MonetDB5
# This file is updated with Maddlog
-* Mon Jul 12 2010 Sjoerd Mullender
-- Fixed bug 2597: This bug manifested itself in rank queries in SQL but
- was a bug in the mergetable optimizer.
-
diff -r 084dad091d4a -r 11489b108f40 MonetDB5/MonetDB-server.spec
--- a/MonetDB5/MonetDB-server.spec Tue Jul 13 10:54:12 2010 +0200
+++ b/MonetDB5/MonetDB-server.spec Tue Jul 13 11:23:16 2010 +0200
@@ -213,6 +213,13 @@
%{_libdir}/*.so
%changelog
+* Tue Jul 13 2010 Sjoerd Mullender - 5.20.3-20100713
+- Rebuilt.
+
+* Mon Jul 12 2010 Sjoerd Mullender - 5.20.3-20100713
+- Fixed bug 2597: This bug manifested itself in rank queries in SQL but
+was a bug in the mergetable optimizer.
+
* Mon Jul 12 2010 Sjoerd Mullender - 5.20.3-20100712
- Rebuilt.
diff -r 084dad091d4a -r 11489b108f40 MonetDB5/debian/changelog
--- a/MonetDB5/debian/changelog Tue Jul 13 10:54:12 2010 +0200
+++ b/MonetDB5/debian/changelog Tue Jul 13 11:23:16 2010 +0200
@@ -1,3 +1,16 @@
+monetdb5-server (5.20.3-20100713) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender Tue, 13 Jul 2010 11:17:24 +0200
+
+monetdb5-server (5.20.3-20100713) unstable; urgency=low
+
+ * Fixed bug 2597: This bug manifested itself in rank queries in SQL but
+was a bug in the mergetable optimizer.
+
+ -- Sjoerd Mullender Mon, 12 Jul 2010 11:17:24 +0200
+
monetdb5-server (5.20.3-20100712) unstable; urgency=low
* Rebuilt.
diff -r 084dad091d4a -r 11489b108f40 clients/MonetDB-client.spec
--- a/clients/MonetDB-client.spec Tue Jul 13 10:54:12 2010 +0200
+++ b/clients/MonetDB-client.spec Tue Jul 13 11:23:16 2010 +0200
@@ -301,6 +301,9 @@
%{_libdir}/MonetDB/Tests/*
%changelog
+* Tue Jul 13 2010 Sjoe
MonetDB: default - Merge with Jun2010 branch.
Changeset: 084dad091d4a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=084dad091d4a
Modified Files:
clients/src/mapiclient/mclient.mx
Branch: default
Log Message:
Merge with Jun2010 branch.
diffs (92 lines):
diff -r 5d2c2a67f899 -r 084dad091d4a clients/src/mapiclient/mclient.mx
--- a/clients/src/mapiclient/mclient.mx Tue Jul 13 10:26:21 2010 +0200
+++ b/clients/src/mapiclient/mclient.mx Tue Jul 13 10:54:12 2010 +0200
@@ -1848,12 +1848,11 @@
if ((hdl = mapi_query(mid,
"SELECT
\"t\".\"name\", \"t\".\"type\", "
"\"s\".\"name\" "
- "FROM
\"sys\".\"tables\" \"t\", "
+ "FROM
\"sys\".\"_tables\" \"t\", "
"\"sys\".\"schemas\" \"s\" "
"WHERE
\"t\".\"schema_id\" = \"s\".\"id\" "
"AND
\"s\".\"name\" = \"current_schema\" "
"AND
\"t\".\"system\" = false "
- "AND
\"t\".\"temporary\" = 0 "
"ORDER BY
\"t\".\"name\"")) != NULL &&
mapi_error(mid) == MOK) {
char *type, *name,
*schema;
diff -r 5d2c2a67f899 -r 084dad091d4a clients/src/mapilib/Mapi.mx
--- a/clients/src/mapilib/Mapi.mx Tue Jul 13 10:26:21 2010 +0200
+++ b/clients/src/mapilib/Mapi.mx Tue Jul 13 10:54:12 2010 +0200
@@ -1054,6 +1054,7 @@
char *errorstr; /* error from server */
struct MapiColumn *fields;
struct MapiRowBuf cache;
+ int commentonly;/* only comments seen so far */
};
@h
@@ -1663,6 +1664,8 @@
result->cache.tuplecount = 0;
result->cache.line = NULL;
+ result->commentonly = 1;
+
return result;
}
@@ -3850,9 +3853,10 @@
nline++;/* query type */
qt = (int) strtol(nline, &nline, 0);
- if (qt != Q_BLOCK || result == NULL)
+ if (result == NULL || (qt != Q_BLOCK && !result->commentonly))
result = new_result(hdl);
result->querytype = qt;
+ result->commentonly = 0;
nline++;/* skip space */
switch (qt) {
@@ -3908,6 +3912,8 @@
n = slice_row(line, NULL, &anchors, &lens, 10, '#');
+ result->commentonly = 0;
+
tag = etag + 1;
while (*tag && isspace((int) (unsigned char) *tag))
tag++;
diff -r 5d2c2a67f899 -r 084dad091d4a
sql/src/test/BugTracker-2009/Tests/dumping_tables.SF-2776908--optimizers.stable.out
---
a/sql/src/test/BugTracker-2009/Tests/dumping_tables.SF-2776908--optimizers.stable.out
Tue Jul 13 10:26:21 2010 +0200
+++
b/sql/src/test/BugTracker-2009/Tests/dumping_tables.SF-2776908--optimizers.stable.out
Tue Jul 13 10:54:12 2010 +0200
@@ -25,30 +25,6 @@
# 12:59:51 > mclient -lsql -umonetdb -Pmonetdb --host=rig --port=33577
# 12:59:51 >
-% .t # table_name
-% name # name
-% varchar # type
-% 12 # length
-[ "_columns" ]
-[ "_tables"]
-[ "args" ]
-[ "auths" ]
-[ "columns"]
-[ "connections"]
-[ "db_user_info" ]
-[ "dependencies" ]
-[ "functions" ]
-[ "idxs" ]
-[ "keycolumns" ]
-[ "keys" ]
-[ "privileges" ]
-[ "schemas"]
-[ "sequences" ]
-[ "tables" ]
-[ "triggers" ]
-[ "types" ]
-[ "user_role" ]
-[ "users" ]
CREATE TABLE "sys"."triggers" (
"id" int,
"name" varchar(1024),
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - merge with Jun2010
Changeset: 5d2c2a67f899 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5d2c2a67f899
Modified Files:
sql/src/server/sql_parser.mx
sql/src/test/BugTracker-2009/Tests/POWER_vs_prod.SF-2596114.stable.out
sql/src/test/BugTracker-2009/Tests/POWER_vs_prod.SF-2596114.stable.out.Debian
sql/src/test/BugTracker-2009/Tests/POWER_vs_prod.SF-2596114.stable.out.Windows
sql/src/test/BugTracker-2009/Tests/explain_gives_crash.SF-2741829.stable.out
sql/src/test/BugTracker-2009/Tests/explain_gives_crash.SF-2741829.stable.out.Debian
sql/src/test/BugTracker-2009/Tests/explain_gives_crash.SF-2741829.stable.out.Windows
sql/src/test/BugTracker/Tests/explain.SF-1739353-data.sql
sql/src/test/BugTracker/Tests/explain.SF-1739353.stable.out
sql/src/test/Tests/trace.sql
sql/src/test/Tests/trace.stable.out
Branch: default
Log Message:
merge with Jun2010
diffs (truncated from 577 to 300 lines):
diff -r b4a2efd2aac9 -r 5d2c2a67f899 sql/src/server/sql_parser.mx
--- a/sql/src/server/sql_parser.mx Tue Jul 13 01:11:33 2010 +0200
+++ b/sql/src/server/sql_parser.mx Tue Jul 13 10:26:21 2010 +0200
@@ -2921,7 +2921,11 @@
{
$$ = $1;
if ($2 || $3 || $4) {
- if ($1 != NULL && ($1->token == SQL_SELECT || $1->token ==
SQL_UNION)) {
+ if ($1 != NULL &&
+ ($1->token == SQL_SELECT ||
+$1->token == SQL_UNION ||
+$1->token == SQL_EXCEPT ||
+$1->token == SQL_INTERSECT)) {
SelectNode *s = (SelectNode*)$1;
s -> orderby = $2;
diff -r b4a2efd2aac9 -r 5d2c2a67f899
sql/src/test/BugTracker-2009/Tests/POWER_vs_prod.SF-2596114.sql
--- a/sql/src/test/BugTracker-2009/Tests/POWER_vs_prod.SF-2596114.sql Tue Jul
13 01:11:33 2010 +0200
+++ b/sql/src/test/BugTracker-2009/Tests/POWER_vs_prod.SF-2596114.sql Tue Jul
13 10:26:21 2010 +0200
@@ -1,3 +1,5 @@
+-- disable parallelism (mitosis & dataflow) to avoid ambiguous results
+set
optimizer='inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,commonTerms,joinPath,reorder,deadcode,reduce,history,multiplex,garbageCollector';
create table SF_2596114 (x double);
explain select power(x,2) from SF_2596114;
explain select x*x from SF_2596114;
diff -r b4a2efd2aac9 -r 5d2c2a67f899
sql/src/test/BugTracker-2009/Tests/POWER_vs_prod.SF-2596114.stable.out
--- a/sql/src/test/BugTracker-2009/Tests/POWER_vs_prod.SF-2596114.stable.out
Tue Jul 13 01:11:33 2010 +0200
+++ b/sql/src/test/BugTracker-2009/Tests/POWER_vs_prod.SF-2596114.stable.out
Tue Jul 13 10:26:21 2010 +0200
@@ -31,7 +31,6 @@
% 0 # length
function user.s0_1{autoCommit=true}():void;
_2 := sql.mvc();
-barrier _36 := language.dataflow();
_3:bat[:oid,:dbl] := sql.bind(_2,"sys","sf_2596114","x",0);
_8:bat[:oid,:dbl] := sql.bind(_2,"sys","sf_2596114","x",2);
_10 := algebra.kdifference(_3,_8);
@@ -41,8 +40,7 @@
_15:bat[:oid,:oid] := sql.bind_dbat(_2,"sys","sf_2596114",1);
_16 := bat.reverse(_15);
_17 := algebra.kdifference(_14,_16);
-_18:bat[:oid,:dbl] := batmmath.pow(_17,2);
-exit _36;
+_18:bat[:oid,:dbl] := batmmath.pow(_17,2:dbl);
_19 := sql.resultSet(1,1,_18);
sql.rsColumn(_19,"sys.","power_x","double",53,0,_18);
_25 := io.stdout();
@@ -54,7 +52,6 @@
% 0 # length
function user.s1_1{autoCommit=true}():void;
_2 := sql.mvc();
-barrier _35 := language.dataflow();
_3:bat[:oid,:dbl] := sql.bind(_2,"sys","sf_2596114","x",0);
_8:bat[:oid,:dbl] := sql.bind(_2,"sys","sf_2596114","x",2);
_10 := algebra.kdifference(_3,_8);
@@ -65,7 +62,6 @@
_16 := bat.reverse(_15);
_17 := algebra.kdifference(_14,_16);
_18:bat[:oid,:dbl] := batcalc.*(_17,_17);
-exit _35;
_19 := sql.resultSet(1,1,_18);
sql.rsColumn(_19,"sys.","sql_mul_x","double",53,0,_18);
_25 := io.stdout();
diff -r b4a2efd2aac9 -r 5d2c2a67f899
sql/src/test/BugTracker-2009/Tests/POWER_vs_prod.SF-2596114.stable.out.Debian
---
a/sql/src/test/BugTracker-2009/Tests/POWER_vs_prod.SF-2596114.stable.out.Debian
Tue Jul 13 01:11:33 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +
@@ -1,74 +0,0 @@
-stdout of test 'POWER_vs_prod.SF-2596114` in directory
'src/test/BugTracker-2009` itself:
-
-
-# 23:02:29 >
-# 23:02:29 > mserver5
"--config=/ufs/manegold/_/scratch0/Monet/Testing/Stable/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert/etc/monetdb5.conf"
--debug=10 --set gdk_nr_threads=0 --set
"monet_mod_path=/ufs/manegold/_/scratch0/Monet/Testing/Stable/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert/lib64/MonetDB5:/ufs/manegold/_/scratch0/Monet/Testing/Stable/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert/lib64/MonetDB5/lib:/ufs/manegold/_/scratch0/Monet/Testing/Stable/prefix.--ena
MonetDB: default - merge with Jun2010
Changeset: b4a2efd2aac9 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b4a2efd2aac9
Modified Files:
Branch: default
Log Message:
merge with Jun2010
diffs (144 lines):
diff -r eca366a838af -r b4a2efd2aac9
sql/src/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out.32bit
--- /dev/null Thu Jan 01 00:00:00 1970 +
+++
b/sql/src/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out.32bit
Tue Jul 13 01:11:33 2010 +0200
@@ -0,0 +1,94 @@
+stdout of test 'group-by_ordered_column.Bug-2564` in directory
'src/test/BugTracker-2010` itself:
+
+
+# 19:36:51 >
+# 19:36:51 > mserver5
"--config=/ufs/manegold/_/scratch0/Monet/HG/Jun2010/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert/etc/monetdb5.conf"
--debug=10 --set gdk_nr_threads=0 --set
"monet_mod_path=/ufs/manegold/_/scratch0/Monet/HG/Jun2010/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert/lib64/MonetDB5:/ufs/manegold/_/scratch0/Monet/HG/Jun2010/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert/lib64/MonetDB5/lib:/ufs/manegold/_/scratch0/Monet/HG/Jun2010/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert/lib64/MonetDB5/bin"
--set
"gdk_dbfarm=/ufs/manegold/_/scratch0/Monet/HG/Jun2010/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert/var/MonetDB5/dbfarm"
--set mapi_open=true --set xrpc_open=true --set mapi_port=30272 --set
xrpc_port=42483 --set monet_prompt= --set mal_listing=2 --trace
"--dbname=mTests_src_test_BugTracker-2010" --set mal_listing=0 ; echo ; echo
Over..
+# 19:36:51 >
+
+# MonetDB server v5.20.3, based on kernel v1.38.2
+# Serving database 'mTests_src_test_BugTracker-2010', using 4 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
+# Found 7.751 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2010 MonetDB B.V., all rights reserved
+# Visit http://monetdb.cwi.nl/ for further information
+# Listening for connection requests on mapi:monetdb://rig.ins.cwi.nl:30272/
+# MonetDB/SQL module v2.38.3 loaded
+# MonetDB/GIS module v0.18.1 loaded
+
+Ready.
+
+Over..
+
+# 19:36:51 >
+# 19:36:51 > mclient -lsql -ftest -i -e --host=rig --port=30272
+# 19:36:51 >
+
+[ 1]
+[ 1]
+[ 1]
+#select * from t2564;
+% sys.t2564, sys.t2564, sys.t2564 # table_name
+% c1, c2, c3 # name
+% int, int,int # type
+% 1, 1, 1 # length
+[ 3, 1, 2 ]
+[ 1, 2, 1 ]
+[ 2, 3, 3 ]
+#explain select count(*) from t2564 group by c1, c2, c3;
+% .explain # table_name
+% mal # name
+% clob # type
+% 0 # length
+function user.s2_1{autoCommit=true}():void;
+_2 := sql.mvc();
+barrier _65 := language.dataflow();
+_3:bat[:oid,:int] := sql.bind(_2,"sys","t2564","c2",0);
+_8:bat[:oid,:int] := sql.bind(_2,"sys","t2564","c2",2);
+_10 := algebra.kdifference(_3,_8);
+_11 := algebra.kunion(_10,_8);
+_12:bat[:oid,:int] := sql.bind(_2,"sys","t2564","c2",1);
+_14 := algebra.kunion(_11,_12);
+_15:bat[:oid,:oid] := sql.bind_dbat(_2,"sys","t2564",1);
+_16 := bat.reverse(_15);
+_17 := algebra.kdifference(_14,_16);
+(ext20,grp18) := group.new(_17);
+_20:bat[:oid,:int] := sql.bind(_2,"sys","t2564","c3",0);
+_22:bat[:oid,:int] := sql.bind(_2,"sys","t2564","c3",2);
+_23 := algebra.kdifference(_20,_22);
+_24 := algebra.kunion(_23,_22);
+_25:bat[:oid,:int] := sql.bind(_2,"sys","t2564","c3",1);
+_26 := algebra.kunion(_24,_25);
+_27 := algebra.kdifference(_26,_16);
+(ext33,grp31) := group.derive(ext20,grp18,_27);
+_30:bat[:oid,:int] := sql.bind(_2,"sys","t2564","c1",0);
+_32:bat[:oid,:int] := sql.bind(_2,"sys","t2564","c1",2);
+_35 := algebra.kdifference(_30,_32);
+_36 := algebra.kunion(_35,_32);
+_37:bat[:oid,:int] := sql.bind(_2,"sys","t2564","c1",1);
+_38 := algebra.kunion(_36,_37);
+_39:bat[:oid,:oid] := sql.bind_dbat(_2,"sys","t2564",1);
+_40 := bat.reverse(_39);
+_41 := algebra.kdifference(_38,_40);
+(ext48,grp46) := group.done(ext33,grp31,_41);
+_44 := bat.mirror(ext48);
+_45:bat[:oid,:wrd] := aggr.count(grp46,grp46,_44);
+exit _65;
+_46 := sql.resultSet(1,1,_45);
+sql.rsColumn(_46,"sys.t2564","L4","wrd",32,0,_45);
+_54 := io.stdout();
+sql.exportResult(_54,_46);
+end s2_1;
+#select count(*) from t2564 group by c1, c2, c3;
+% sys.t2564 # table_name
+% L5 # name
+% wrd # type
+% 1 # length
+[ 1]
+[ 1]
+[ 1]
+
+# 19:36:51 >
+# 19:36:51 > Done.
+# 19:36:51 >
+
diff -r eca366a838af -r b4a2efd2aac9
sql/src/test/BugTracker-2010/Tests/prepare_stmt.Bug-2533.Bug-2534.stable.out.32bit
--- /dev/null Thu Jan 01 00:00:00 1970 +
+++
b/sql/src/test/BugTracker-2010/Tests/prepare_stmt.Bug-2533.Bug-2534.stable.out.32bit
Tue Jul 13 01:11:33 2010 +0200
@@ -0,0 +1,42 @@
+stdout of test
MonetDB: default - merge with Jun2010
Changeset: eca366a838af for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=eca366a838af Modified Files: Branch: default Log Message: merge with Jun2010 diffs (104 lines): diff -r 833dda1332e3 -r eca366a838af sql/src/test/bugs/Tests/except-union-intersect-bug-sf-1146079.stable.out --- a/sql/src/test/bugs/Tests/except-union-intersect-bug-sf-1146079.stable.out Mon Jul 12 22:04:34 2010 +0200 +++ b/sql/src/test/bugs/Tests/except-union-intersect-bug-sf-1146079.stable.out Mon Jul 12 23:28:10 2010 +0200 @@ -317,26 +317,26 @@ START TRANSACTION; Operation successful -SELECT class FROM a EXCEPT ALL SELECT 16; -- all but one 16 (will have 16 in output!) -+---+ -| class | -+===+ -|17 | -|17 | -|17 | -|17 | -| 2 | -|11 | -|18 | -|18 | -|16 | -|16 | -|16 | -|16 | -|16 | -|16 | -|16 | -+---+ +select * from ( SELECT class FROM a EXCEPT ALL SELECT 16 ) as t order by class; -- all but one 16 (will have 16 in output!) +++ +| class | +++ +| 2 | +| 11 | +| 16 | +| 16 | +| 16 | +| 16 | +| 16 | +| 16 | +| 16 | +| 17 | +| 17 | +| 17 | +| 17 | +| 18 | +| 18 | +++ 15 rows SELECT class FROM a UNION ALL SELECT 16; -- all plus 16 @@ -396,19 +396,19 @@ +--+---+ 8 rows -SELECT class FROM a EXCEPT ALL SELECT class FROM b; -- a minus the elements from b that are in a (if count(x) in a > count(x) in b, x will appear in output) -+---+ -| class | -+===+ -|11 | -|18 | -|18 | -|16 | -|16 | -|16 | -|16 | -|16 | -+---+ +select * from ( SELECT class FROM a EXCEPT ALL SELECT class FROM b ) as t order by class; -- a minus the elements from b that are in a (if count(x) in a > count(x) in b, x will appear in output) +++ +| class | +++ +| 11 | +| 16 | +| 16 | +| 16 | +| 16 | +| 16 | +| 18 | +| 18 | +++ 8 rows SELECT * FROM a UNION ALL SELECT * FROM b; -- a + b diff -r 833dda1332e3 -r eca366a838af sql/src/test/bugs/except-union-intersect-bug-sf-1146079.sql --- a/sql/src/test/bugs/except-union-intersect-bug-sf-1146079.sql Mon Jul 12 22:04:34 2010 +0200 +++ b/sql/src/test/bugs/except-union-intersect-bug-sf-1146079.sql Mon Jul 12 23:28:10 2010 +0200 @@ -73,7 +73,7 @@ -- now check the non-duplicate removing versions -- (they are very tricky, so be on your marks!) START TRANSACTION; -SELECT class FROM a EXCEPT ALL SELECT 16; -- all but one 16 (will have 16 in output!) +select * from ( SELECT class FROM a EXCEPT ALL SELECT 16 ) as t order by class; -- all but one 16 (will have 16 in output!) SELECT class FROM a UNION ALL SELECT 16; -- all plus 16 SELECT class FROM a INTERSECT ALL SELECT 16; -- just one 16 (!) ROLLBACK; @@ -83,7 +83,7 @@ -- would never be tested for tables) START TRANSACTION; SELECT * FROM a EXCEPT ALL SELECT * FROM b; -- last 50% of a -SELECT class FROM a EXCEPT ALL SELECT class FROM b; -- a minus the elements from b that are in a (if count(x) in a > count(x) in b, x will appear in output) +select * from ( SELECT class FROM a EXCEPT ALL SELECT class FROM b ) as t order by class; -- a minus the elements from b that are in a (if count(x) in a > count(x) in b, x will appear in output) SELECT * FROM a UNION ALL SELECT * FROM b; -- a + b SELECT * FROM a INTERSECT ALL SELECT * FROM b; -- first 50% of a SELECT class FROM a INTERSECT ALL SELECT class FROM b; -- only those that are both in a and b (min(count(a, x), count(b, x)) !!! ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merge with Jun2010 branch.
Changeset: 833dda1332e3 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=833dda1332e3 Modified Files: Branch: default Log Message: Merge with Jun2010 branch. diffs (42 lines): diff -r 5733c6d8219b -r 833dda1332e3 sql/src/test/BugDay_2005-11-09_2.9.3/Tests/or_select.SF-1114540.sql --- a/sql/src/test/BugDay_2005-11-09_2.9.3/Tests/or_select.SF-1114540.sql Mon Jul 12 19:59:02 2010 +0200 +++ b/sql/src/test/BugDay_2005-11-09_2.9.3/Tests/or_select.SF-1114540.sql Mon Jul 12 22:04:34 2010 +0200 @@ -5,10 +5,10 @@ INSERT INTO t1114540 VALUES (11); INSERT INTO t1114540 VALUES (12); -SELECT * FROM t1114540 WHERE (id=10) OR (id=11); -SELECT * FROM t1114540 WHERE ((id=10) OR (id=11)) OR id=12; -SELECT id FROM t1114540 WHERE id<11 OR id>11; -SELECT id FROM t1114540 WHERE id>11 OR id<11; -SELECT id FROM t1114540 WHERE id>=11 OR id<=10; -SELECT id FROM t1114540 WHERE id>12 OR id<10; -SELECT id FROM t1114540 WHERE id<11 OR id IS NULL; +SELECT * FROM t1114540 WHERE (id=10) OR (id=11) ORDER BY id; +SELECT * FROM t1114540 WHERE ((id=10) OR (id=11)) OR id=12 ORDER BY id; +SELECT id FROM t1114540 WHERE id<11 OR id>11 ORDER BY id; +SELECT id FROM t1114540 WHERE id>11 OR id<11 ORDER BY id; +SELECT id FROM t1114540 WHERE id>=11 OR id<=10 ORDER BY id; +SELECT id FROM t1114540 WHERE id>12 OR id<10 ORDER BY id; +SELECT id FROM t1114540 WHERE id<11 OR id IS NULL ORDER BY id; diff -r 5733c6d8219b -r 833dda1332e3 sql/src/test/BugDay_2005-11-09_2.9.3/Tests/or_select.SF-1114540.stable.out --- a/sql/src/test/BugDay_2005-11-09_2.9.3/Tests/or_select.SF-1114540.stable.out Mon Jul 12 19:59:02 2010 +0200 +++ b/sql/src/test/BugDay_2005-11-09_2.9.3/Tests/or_select.SF-1114540.stable.out Mon Jul 12 22:04:34 2010 +0200 @@ -51,15 +51,15 @@ % id # name % int # type % 2 # length +[ 10 ] [ 12 ] -[ 10 ] % sys.t1114540 # table_name % id # name % int # type % 2 # length +[ 10 ] [ 11 ] [ 12 ] -[ 10 ] % sys.t1114540 # table_name % id # name % int # type ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merge with Jun2010 branch.
Changeset: 8d21c4ba4845 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8d21c4ba4845 Modified Files: Branch: default Log Message: Merge with Jun2010 branch. diffs (11 lines): diff -r d68bb2df0db8 -r 8d21c4ba4845 MonetDB5/ChangeLog.Jun2010 --- a/MonetDB5/ChangeLog.Jun2010Mon Jul 12 17:13:40 2010 +0200 +++ b/MonetDB5/ChangeLog.Jun2010Mon Jul 12 17:16:49 2010 +0200 @@ -1,3 +1,7 @@ # ChangeLog file for MonetDB5 # This file is updated with Maddlog +* Mon Jul 12 2010 Sjoerd Mullender +- Fixed bug 2597: This bug manifested itself in rank queries in SQL but + was a bug in the mergetable optimizer. + ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merge with Jun2010 branch: Fix bug 2597.
Changeset: d68bb2df0db8 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d68bb2df0db8
Modified Files:
MonetDB5/src/optimizer/opt_prelude.mx
MonetDB5/src/optimizer/opt_support.mx
Branch: default
Log Message:
Merge with Jun2010 branch: Fix bug 2597.
The function isMapOp is supposed to be conservative, but it wasn't conservative
enough.
Don't treat batcalc.mark_grp and batcalc.rank_grp as map operators.
diffs (68 lines):
diff -r 5452a9ac28d5 -r d68bb2df0db8 MonetDB5/src/optimizer/opt_prelude.mx
--- a/MonetDB5/src/optimizer/opt_prelude.mx Mon Jul 12 15:33:55 2010 +0200
+++ b/MonetDB5/src/optimizer/opt_prelude.mx Mon Jul 12 17:13:40 2010 +0200
@@ -112,6 +112,7 @@
opt_export str mapiRef;
opt_export str markHRef;
opt_export str markTRef;
+opt_export str mark_grpRef;
opt_export str materializeRef;
opt_export str matRef;
opt_export str max_no_nilRef;
@@ -143,6 +144,7 @@
opt_export str projectRef;
opt_export str putRef;
opt_export str queryRef;
+opt_export str rank_grpRef;
opt_export str reconnectRef;
opt_export str recycleRef;
opt_export str refineRef;
@@ -307,6 +309,7 @@
str mapiRef;
str markHRef;
str markTRef;
+str mark_grpRef;
str materializeRef;
str matRef;
str max_no_nilRef;
@@ -338,6 +341,7 @@
str projectRef;
str putRef;
str queryRef;
+str rank_grpRef;
str reconnectRef;
str recycleRef;
str refineRef;
@@ -498,6 +502,7 @@
mapiRef = putName("mapi", 4);
markHRef = putName("markH", 5);
markTRef = putName("markT", 5);
+ mark_grpRef = putName("mark_grp", 8);
materializeRef = putName("materialize", 11);
matRef = putName("mat", 3);
max_no_nilRef = putName("max_no_nil", 10);
@@ -529,6 +534,7 @@
projectRef = putName("project",7);
putRef = putName("put",3);
queryRef = putName("query",5);
+ rank_grpRef = putName("rank_grp", 8);
reconnectRef = putName("reconnect",9);
recycleRef = putName("recycle",7);
refineRef = putName("refine",6);
diff -r 5452a9ac28d5 -r d68bb2df0db8 MonetDB5/src/optimizer/opt_support.mx
--- a/MonetDB5/src/optimizer/opt_support.mx Mon Jul 12 15:33:55 2010 +0200
+++ b/MonetDB5/src/optimizer/opt_support.mx Mon Jul 12 17:13:40 2010 +0200
@@ -1241,11 +1241,11 @@
}
@-
-Used in the merge table optimizer. It is build incrementally
+Used in the merge table optimizer. It is built incrementally
and should be conservative.
@c
int isMapOp(InstrPtr p){
- return (getModuleId(p)== batcalcRef) ||
+ return (getModuleId(p)== batcalcRef && getFunctionId(p) != mark_grpRef
&& getFunctionId(p) != rank_grpRef) ||
(getModuleId(p)== batmtimeRef) ||
(getModuleId(p)== batstrRef) ||
(getModuleId(p)== mkeyRef);
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merge with Jun2010 branch.
Changeset: 23d41c408edf for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=23d41c408edf Modified Files: Branch: default Log Message: Merge with Jun2010 branch. See also bug 2597. diffs (164 lines): diff -r 83cbe43676dc -r 23d41c408edf sql/src/test/Tests/rank.stable.out --- a/sql/src/test/Tests/rank.stable.outMon Jul 12 12:41:02 2010 +0200 +++ b/sql/src/test/Tests/rank.stable.outMon Jul 12 15:22:51 2010 +0200 @@ -34,25 +34,7 @@ % sys. # table_name % foo # name % int # type -% 1 # length -[ 1] -[ 2] -[ 3] -[ 4] -[ 5] -[ 6] -[ 1] -[ 2] -[ 3] -[ 4] -[ 5] -[ 6] -[ 1] -[ 2] -[ 3] -[ 4] -[ 5] -[ 6] +% 2 # length [ 1] [ 2] [ 3] @@ -62,6 +44,24 @@ [ 7] [ 8] [ 9] +[ 10 ] +[ 11 ] +[ 12 ] +[ 13 ] +[ 14 ] +[ 15 ] +[ 16 ] +[ 17 ] +[ 18 ] +[ 19 ] +[ 20 ] +[ 21 ] +[ 22 ] +[ 23 ] +[ 24 ] +[ 25 ] +[ 26 ] +[ 27 ] #select ROW_NUMBER() over (PARTITION BY id) as foo, id from ranktest; % ., sys.ranktest # table_name % foo, id # name @@ -159,25 +159,7 @@ % sys. # table_name % foo # name % int # type -% 1 # length -[ 1] -[ 2] -[ 3] -[ 4] -[ 5] -[ 6] -[ 1] -[ 2] -[ 3] -[ 4] -[ 5] -[ 6] -[ 1] -[ 2] -[ 3] -[ 4] -[ 5] -[ 6] +% 2 # length [ 1] [ 2] [ 3] @@ -187,6 +169,24 @@ [ 7] [ 8] [ 9] +[ 10 ] +[ 11 ] +[ 12 ] +[ 13 ] +[ 14 ] +[ 15 ] +[ 16 ] +[ 17 ] +[ 18 ] +[ 19 ] +[ 20 ] +[ 21 ] +[ 22 ] +[ 23 ] +[ 24 ] +[ 25 ] +[ 26 ] +[ 27 ] #select RANK() over (PARTITION BY id) as foo, id from ranktest; % ., sys.ranktest # table_name % foo, id # name @@ -284,34 +284,34 @@ % sys.,sys.ranktest, sys.ranktest # table_name % foo, id, k # name % int, int,clob # type -% 1, 4, 8 # length +% 2, 4, 8 # length [ 1, 1061, "varchar" ] [ 2, 1061, "int" ] [ 3, 1061, "varchar" ] [ 4, 1061, "varchar" ] [ 5, 1061, "int" ] [ 6, 1061, "int" ] -[ 1, 1061, "varchar" ] -[ 2, 1061, "varchar" ] -[ 3, 1061, "boolean" ] -[ 4, 1061, "boolean" ] -[ 5, 1061, "int" ] -[ 6, 1061, "varchar" ] -[ 1, 1061, "char" ] -[ 2, 1062, "int" ] -[ 3, 1062, "char" ] -[ 4, 1062, "char" ] -[ 5, 1062, "int" ] -[ 6, 1062, "smallint" ] -[ 1, 1062, "boolean" ] -[ 2, 1062, "smallint" ] -[ 3, 1061, "int" ] -[ 4, 1061, "varchar" ] -[ 5, 1061, "int" ] -[ 6, 1061, "varchar" ] -[ 7, 1061, "int" ] -[ 8, 1061, "int" ] -[ 9, 1061, "smallint" ] +[ 7, 1061, "varchar" ] +[ 8, 1061, "varchar" ] +[ 9, 1061, "boolean" ] +[ 10, 1061, "boolean" ] +[ 11, 1061, "int" ] +[ 12, 1061, "varchar" ] +[ 13, 1061, "char" ] +[ 14, 1062, "int" ] +[ 15, 1062, "char" ] +[ 16, 1062, "char" ] +[ 17, 1062, "int" ] +[ 18, 1062, "smallint" ] +[ 19, 1062, "boolean" ] +[ 20, 1062, "smallint" ] +[ 21, 1061, "int" ] +[ 22, 1061, "varchar" ] +[ 23, 1061, "int" ] +[ 24, 1061, "varchar" ] +[ 25, 1061, "int" ] +[ 26, 1061, "int" ] +[ 27, 1061, "smallint" ] #select RANK() over (PARTITION BY id) as foo, id, k from ranktest; % ., sys.ranktest, sys.ranktest # table_name % foo, id, k # name ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merge with Jun2010 branch.
Changeset: 83cbe43676dc for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=83cbe43676dc
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
testing/MonetDB-testing.spec
Branch: default
Log Message:
Merge with Jun2010 branch.
diffs (260 lines):
diff -r 0e0de722f848 -r 83cbe43676dc .hgtags
--- a/.hgtags Mon Jul 12 11:28:28 2010 +0200
+++ b/.hgtags Mon Jul 12 12:41:02 2010 +0200
@@ -417,3 +417,5 @@
700a31b47b8a8fd449607d16f14c5c96d3c503cb Jun2010_3
700a31b47b8a8fd449607d16f14c5c96d3c503cb Jun2010_3
e4fe1c3cabfee2bba0b620aee6c3e9d569d37e17 Jun2010_3
+e4fe1c3cabfee2bba0b620aee6c3e9d569d37e17 Jun2010_3
+9aa479df22dda265b8c685f9e15b0899244b0184 Jun2010_3
diff -r 0e0de722f848 -r 83cbe43676dc MonetDB/MonetDB.spec
--- a/MonetDB/MonetDB.spec Mon Jul 12 11:28:28 2010 +0200
+++ b/MonetDB/MonetDB.spec Mon Jul 12 12:41:02 2010 +0200
@@ -106,6 +106,9 @@
%{_libdir}/libbat.so
%changelog
+* Mon Jul 12 2010 Sjoerd Mullender - 1.38.3-20100712
+- Rebuilt.
+
* Fri Jul 09 2010 Sjoerd Mullender - 1.38.3-20100709
- Rebuilt.
diff -r 0e0de722f848 -r 83cbe43676dc MonetDB/debian/changelog
--- a/MonetDB/debian/changelog Mon Jul 12 11:28:28 2010 +0200
+++ b/MonetDB/debian/changelog Mon Jul 12 12:41:02 2010 +0200
@@ -1,3 +1,9 @@
+monetdb (1.38.3-20100712) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender Mon, 12 Jul 2010 12:00:27 +0200
+
monetdb (1.38.3-20100709) unstable; urgency=low
* Rebuilt.
diff -r 0e0de722f848 -r 83cbe43676dc MonetDB4/MonetDB-server.spec
--- a/MonetDB4/MonetDB-server.spec Mon Jul 12 11:28:28 2010 +0200
+++ b/MonetDB4/MonetDB-server.spec Mon Jul 12 12:41:02 2010 +0200
@@ -216,6 +216,9 @@
%{_libdir}/libembeddedmil.so
%changelog
+* Mon Jul 12 2010 Sjoerd Mullender - 4.38.3-20100712
+- Rebuilt.
+
* Fri Jul 09 2010 Sjoerd Mullender - 4.38.3-20100709
- Rebuilt.
diff -r 0e0de722f848 -r 83cbe43676dc MonetDB4/debian/changelog
--- a/MonetDB4/debian/changelog Mon Jul 12 11:28:28 2010 +0200
+++ b/MonetDB4/debian/changelog Mon Jul 12 12:41:02 2010 +0200
@@ -1,3 +1,9 @@
+monetdb4-server (4.38.3-20100712) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender Mon, 12 Jul 2010 12:00:27 +0200
+
monetdb4-server (4.38.3-20100709) unstable; urgency=low
* Rebuilt.
diff -r 0e0de722f848 -r 83cbe43676dc MonetDB5/MonetDB-server.spec
--- a/MonetDB5/MonetDB-server.spec Mon Jul 12 11:28:28 2010 +0200
+++ b/MonetDB5/MonetDB-server.spec Mon Jul 12 12:41:02 2010 +0200
@@ -213,6 +213,9 @@
%{_libdir}/*.so
%changelog
+* Mon Jul 12 2010 Sjoerd Mullender - 5.20.3-20100712
+- Rebuilt.
+
* Fri Jul 09 2010 Sjoerd Mullender - 5.20.3-20100709
- Rebuilt.
diff -r 0e0de722f848 -r 83cbe43676dc MonetDB5/debian/changelog
--- a/MonetDB5/debian/changelog Mon Jul 12 11:28:28 2010 +0200
+++ b/MonetDB5/debian/changelog Mon Jul 12 12:41:02 2010 +0200
@@ -1,3 +1,9 @@
+monetdb5-server (5.20.3-20100712) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender Mon, 12 Jul 2010 12:00:27 +0200
+
monetdb5-server (5.20.3-20100709) unstable; urgency=low
* Rebuilt.
diff -r 0e0de722f848 -r 83cbe43676dc clients/MonetDB-client.spec
--- a/clients/MonetDB-client.spec Mon Jul 12 11:28:28 2010 +0200
+++ b/clients/MonetDB-client.spec Mon Jul 12 12:41:02 2010 +0200
@@ -301,6 +301,9 @@
%{_libdir}/MonetDB/Tests/*
%changelog
+* Mon Jul 12 2010 Sjoerd Mullender - 1.38.3-20100712
+- Rebuilt.
+
* Fri Jul 09 2010 Sjoerd Mullender - 1.38.3-20100709
- Rebuilt.
diff -r 0e0de722f848 -r 83cbe43676dc clients/debian/changelog
--- a/clients/debian/changelog Mon Jul 12 11:28:28 2010 +0200
+++ b/clients/debian/changelog Mon Jul 12 12:41:02 2010 +0200
@@ -1,3 +1,9 @@
+monetdb-client (1.38.3-20100712) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender Mon, 12 Jul 2010 12:00:28 +0200
+
monetdb-client (1.38.3-20100709) unstable; urgency=low
* Rebuilt.
diff -r 0e0de722f848 -r 83cbe43676dc geom/MonetDB-geom.spec
--- a/geom/MonetDB-geom.specMon Jul 12 11:28:28 2010 +0200
+++ b/geom/MonetDB-geom.specMon Jul 12 12:41:02 2010 +0200
@@ -172,6 +172,9 @@
%endif
%changelog
+* Mon Jul 12 2010 Sjoerd Mullender - 0.18.3-20100712
+- Rebuilt.
+
*
MonetDB: default - Merge with Jun2010 branch.
Changeset: 0e0de722f848 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0e0de722f848
Modified Files:
sql/ChangeLog.Jun2010
sql/NT/MonetDB5-SQL/MonetDB5-SQL-Installer.vdproj
sql/NT/MonetDB5-SQL/MonetDB5-SQL.vdproj
sql/NT/MonetDB5-SQL/MonetDB5-SQL64.vdproj
sql/NT/MonetDB5-SQL64/MonetDB5-SQL-Installer.vdproj
Branch: default
Log Message:
Merge with Jun2010 branch.
diffs (75 lines):
diff -r 0eea43253a16 -r 0e0de722f848 sql/ChangeLog.Jun2010
--- a/sql/ChangeLog.Jun2010 Mon Jul 12 11:19:20 2010 +0200
+++ b/sql/ChangeLog.Jun2010 Mon Jul 12 11:28:28 2010 +0200
@@ -7,3 +7,7 @@
work, again, that were broken since Jun 22 2010
triggering errors like "ORDER BY: missing select operator"
+* Fri Jul 9 2010 Fabian Groffen
+- Removed false connection warning about missing SQL script ("could not
+ read createdb.sql") received by the client upon first connect on a
+ newly created database. Bug #2591
diff -r 0eea43253a16 -r 0e0de722f848
sql/NT/MonetDB5-SQL/MonetDB5-SQL-Installer.vdproj
--- a/sql/NT/MonetDB5-SQL/MonetDB5-SQL-Installer.vdproj Mon Jul 12 11:19:20
2010 +0200
+++ b/sql/NT/MonetDB5-SQL/MonetDB5-SQL-Installer.vdproj Mon Jul 12 11:28:28
2010 +0200
@@ -1305,12 +1305,6 @@
}
"Entry"
{
-"MsmKey" = "8:_CEF22C247B2E476FBBAB8046DDBC0F1A"
-"OwnerKey" = "8:_UNDEFINED"
-"MsmSig" = "8:_UNDEFINED"
-}
-"Entry"
-{
"MsmKey" = "8:_CF5DC8BD4BFA4D7EA31F3B1BBB4EB5A1"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
diff -r 0eea43253a16 -r 0e0de722f848 sql/NT/MonetDB5-SQL/MonetDB5-SQL.vdproj
--- a/sql/NT/MonetDB5-SQL/MonetDB5-SQL.vdproj Mon Jul 12 11:19:20 2010 +0200
+++ b/sql/NT/MonetDB5-SQL/MonetDB5-SQL.vdproj Mon Jul 12 11:28:28 2010 +0200
@@ -33,12 +33,6 @@
}
"Entry"
{
-"MsmKey" = "8:_4E285A2638A04D71AC11F06FA1EF0AA7"
-"OwnerKey" = "8:_UNDEFINED"
-"MsmSig" = "8:_UNDEFINED"
-}
-"Entry"
-{
"MsmKey" = "8:_60556A506BDF4F0A83013CA0B54EDC9E"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
diff -r 0eea43253a16 -r 0e0de722f848 sql/NT/MonetDB5-SQL/MonetDB5-SQL64.vdproj
--- a/sql/NT/MonetDB5-SQL/MonetDB5-SQL64.vdproj Mon Jul 12 11:19:20 2010 +0200
+++ b/sql/NT/MonetDB5-SQL/MonetDB5-SQL64.vdproj Mon Jul 12 11:28:28 2010 +0200
@@ -93,12 +93,6 @@
}
"Entry"
{
-"MsmKey" = "8:_A095E6625D794D4AA25BDDFC71B855D4"
-"OwnerKey" = "8:_UNDEFINED"
-"MsmSig" = "8:_UNDEFINED"
-}
-"Entry"
-{
"MsmKey" = "8:_A83A85D1131B4E8E95AB48367C69141D"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
diff -r 0eea43253a16 -r 0e0de722f848
sql/NT/MonetDB5-SQL64/MonetDB5-SQL-Installer.vdproj
--- a/sql/NT/MonetDB5-SQL64/MonetDB5-SQL-Installer.vdproj Mon Jul 12
11:19:20 2010 +0200
+++ b/sql/NT/MonetDB5-SQL64/MonetDB5-SQL-Installer.vdproj Mon Jul 12
11:28:28 2010 +0200
@@ -921,12 +921,6 @@
}
"Entry"
{
-"MsmKey" = "8:_981F356AD9144ACFA0F368DEC3CCD599"
-"OwnerKey" = "8:_UNDEFINED"
-"MsmSig" = "8:_UNDEFINED"
-}
-"Entry"
-{
"MsmKey" = "8:_98E6FA0B4886462284DC79CA1CA41987"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - merge with Jun2010
Changeset: b5d877dd223c for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b5d877dd223c Modified Files: sql/ChangeLog.Jun2010 Branch: default Log Message: merge with Jun2010 diffs (14 lines): diff -r 748c3b387bf0 -r b5d877dd223c sql/ChangeLog.Jun2010 --- a/sql/ChangeLog.Jun2010 Sun Jul 11 20:07:11 2010 +0200 +++ b/sql/ChangeLog.Jun2010 Mon Jul 12 10:53:00 2010 +0200 @@ -1,3 +1,10 @@ # ChangeLog file for sql # This file is updated with Maddlog +* Mon Jul 12 2010 Stefan Manegold +- Make queries like + (SELECT ...) UNION ALL (SELECT ...) ORDER BY ...; + work, again, that were broken since Jun 22 2010 + triggering errors like + "!ORDER BY: missing select operator" + ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - merge with Jun2010
Changeset: 56abe34dffc5 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=56abe34dffc5 Modified Files: pathfinder/NT/rules.msc Branch: default Log Message: merge with Jun2010 diffs (70 lines): diff -r 8898158dcf0c -r 56abe34dffc5 buildtools/conf/winrules.msc --- a/buildtools/conf/winrules.msc Sun Jul 11 10:55:40 2010 +0200 +++ b/buildtools/conf/winrules.msc Sun Jul 11 11:34:13 2010 +0200 @@ -303,6 +303,12 @@ !IFDEF HAVE_PHP HAVE_PHP_FALSE=^# !ENDIF +!IFDEF HAVE_PFTIJAH +HAVE_PFTIJAH_FALSE=^# +!ENDIF +!IFDEF HAVE_PROBXML +HAVE_PROBXML_FALSE=^# +!ENDIF !IFDEF HAVE_PYTHON HAVE_PYTHON_FALSE=^# !ENDIF @@ -354,6 +360,8 @@ "HAVE_PERL_FALSE=$(HAVE_PERL_FALSE)" \ "HAVE_PERL_SWIG_FALSE=$(HAVE_PERL_SWIG_FALSE)" \ "HAVE_PHP_FALSE=$(HAVE_PHP_FALSE)" \ + "HAVE_PFTIJAH_FALSE=$(HAVE_PFTIJAH_FALSE)" \ + "HAVE_PROBXML_FALSE=$(HAVE_PROBXML_FALSE)" \ "HAVE_PYTHON_FALSE=$(HAVE_PYTHON_FALSE)" \ "HAVE_RAPTOR_FALSE=$(HAVE_RAPTOR_FALSE)" \ "HAVE_RUBYGEM_FALSE=$(HAVE_RUBYGEM_FALSE)" \ diff -r 8898158dcf0c -r 56abe34dffc5 pathfinder/NT/rules.msc --- a/pathfinder/NT/rules.msc Sun Jul 11 10:55:40 2010 +0200 +++ b/pathfinder/NT/rules.msc Sun Jul 11 11:34:13 2010 +0200 @@ -25,6 +25,10 @@ W_CFLAGS = -WX !ENDIF +# also see pf_config.h.in +HAVE_PFTIJAH = 1 +# HAVE_PROBXML = + !IFDEF NEED_MX RULESMSC = $(TOPDIR)\..\..\buildtools\conf\winrules.msc !ELSE @@ -91,6 +95,3 @@ !ENDIF !ENDIF !ENDIF - -# also see pf_config.h.in -HAVE_PFTIJAH=yes diff -r 8898158dcf0c -r 56abe34dffc5 pathfinder/conf/Tests/monetdb-xquery-conds.stable.out.Windows.32bit --- a/pathfinder/conf/Tests/monetdb-xquery-conds.stable.out.Windows.32bit Sun Jul 11 10:55:40 2010 +0200 +++ b/pathfinder/conf/Tests/monetdb-xquery-conds.stable.out.Windows.32bit Sun Jul 11 11:34:13 2010 +0200 @@ -15,7 +15,7 @@ DOCTOOLS= HAVE_BUILDTOOLS=# HAVE_CLIENTS=# -HAVE_EXTRA_MK=# +HAVE_EXTRA_MK= HAVE_MONETDB4=# HAVE_MONETDB5=# HAVE_MONETDB5_RDF= diff -r 8898158dcf0c -r 56abe34dffc5 pathfinder/conf/Tests/monetdb-xquery-conds.stable.out.Windows.64bit --- a/pathfinder/conf/Tests/monetdb-xquery-conds.stable.out.Windows.64bit Sun Jul 11 10:55:40 2010 +0200 +++ b/pathfinder/conf/Tests/monetdb-xquery-conds.stable.out.Windows.64bit Sun Jul 11 11:34:13 2010 +0200 @@ -15,7 +15,7 @@ DOCTOOLS= HAVE_BUILDTOOLS=# HAVE_CLIENTS=# -HAVE_EXTRA_MK=# +HAVE_EXTRA_MK= HAVE_MONETDB4=# HAVE_MONETDB5=# HAVE_MONETDB5_RDF= ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - merge with Jun2010
Changeset: 8898158dcf0c for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8898158dcf0c Modified Files: pathfinder/tests/BugTracker/Tests/node-name.Bug-2600.-d0.stable.err.patch-16479 pathfinder/tests/BugTracker/Tests/node-name.Bug-2600.-d0.stable.out.patch-16479 pathfinder/tests/BugTracker/Tests/node-name.Bug-2600.-d10.stable.err.patch-16479 pathfinder/tests/BugTracker/Tests/node-name.Bug-2600.-d10.stable.out.patch-16479 Branch: default Log Message: merge with Jun2010 diffs (140 lines): diff -r 761c1b3288e9 -r 8898158dcf0c pathfinder/tests/BugTracker/Tests/node-name.Bug-2600.-d0.stable.err.patch-16479 --- a/pathfinder/tests/BugTracker/Tests/node-name.Bug-2600.-d0.stable.err.patch-16479 Sat Jul 10 19:39:17 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 + @@ -1,24 +0,0 @@ /net/rig.ins.cwi.nl/export/scratch0/manegold/Monet/HG/Jun2010/source/pathfinder/tests/BugTracker/Tests/node-name.Bug-2600.-d0.stable.err.ORG 2010-07-10 18:52:17.0 +0200 -+++ /net/rig.ins.cwi.nl/export/scratch0/manegold/Monet/HG/Jun2010/source/pathfinder/tests/BugTracker/Tests/node-name.Bug-2600.-d0.stable.err 2010-07-10 18:52:17.0 +0200 -@@ -0,0 +1,21 @@ -+stderr of test 'node-name.Bug-2600.-d0` in directory 'tests/BugTracker` itself: -+ -+ -+# 18:52:05 > -+# 18:52:05 > Mserver "--config=/ufs/manegold/_/scratch0/Monet/HG/Jun2010/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert/etc/MonetDB.conf" --debug=0 --set gdk_nr_threads=1 --set "monet_mod_path=/ufs/manegold/_/scratch0/Monet/HG/Jun2010/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert/lib64/MonetDB4:/ufs/manegold/_/scratch0/Monet/HG/Jun2010/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert/lib64/MonetDB4/lib:/ufs/manegold/_/scratch0/Monet/HG/Jun2010/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert/lib64/MonetDB4/bin" --set "gdk_dbfarm=/ufs/manegold/_/scratch0/Monet/HG/Jun2010/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert/var/MonetDB4/dbfarm" --set mapi_open=true --set xrpc_open=true --set mapi_port=38866 --set xrpc_port=49469 --set monet_prompt= --trace "--dbname=mTests_tests_BugTracker" "--dbinit=debugmask(and(debugmask(),xor(INT_MAX,8+2))); module( pathfinder);" ; echo ; echo Over.. -+# 18:52:05 > -+ -+ -+# 18:52:06 > -+# 18:52:06 > mclient -lxquery -fxml --host=rig --port=38866 node-name.Bug-2600.-d0.xq -+# 18:52:06 > -+ -+MAPI = mone...@rig:38866 -+QUERY = declare namespace pxmlsup = "http://www.cs.utwente.nl/~keulen/pxmlsup";; -+ERROR = !ERROR: merged_union: BAT/column 2 of table 1 must have a dense head. -+!ERROR: CMDmerged_union: operation failed. -+ -+# 18:52:06 > -+# 18:52:06 > Done. -+# 18:52:06 > -+ diff -r 761c1b3288e9 -r 8898158dcf0c pathfinder/tests/BugTracker/Tests/node-name.Bug-2600.-d0.stable.out.patch-16479 --- a/pathfinder/tests/BugTracker/Tests/node-name.Bug-2600.-d0.stable.out.patch-16479 Sat Jul 10 19:39:17 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 + @@ -1,39 +0,0 @@ /net/rig.ins.cwi.nl/export/scratch0/manegold/Monet/HG/Jun2010/source/pathfinder/tests/BugTracker/Tests/node-name.Bug-2600.-d0.stable.out.ORG 2010-07-10 18:52:17.0 +0200 -+++ /net/rig.ins.cwi.nl/export/scratch0/manegold/Monet/HG/Jun2010/source/pathfinder/tests/BugTracker/Tests/node-name.Bug-2600.-d0.stable.out 2010-07-10 18:52:17.0 +0200 -@@ -0,0 +1,36 @@ -+stdout of test 'node-name.Bug-2600.-d0` in directory 'tests/BugTracker` itself: -+ -+ -+# 18:52:05 > -+# 18:52:05 > Mserver "--config=/ufs/manegold/_/scratch0/Monet/HG/Jun2010/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert/etc/MonetDB.conf" --debug=0 --set gdk_nr_threads=1 --set "monet_mod_path=/ufs/manegold/_/scratch0/Monet/HG/Jun2010/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert/lib64/MonetDB4:/ufs/manegold/_/scratch0/Monet/HG/Jun2010/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert/lib64/MonetDB4/lib:/ufs/manegold/_/scratch0/Monet/HG/Jun2010/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert/lib64/MonetDB4/bin" --set "gdk_dbfarm=/ufs/manegold/_/scratch0/Monet/HG/Jun2010/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert/var/MonetDB4/dbfarm" --set mapi_open=true --set xrpc_open=true --set mapi_port=38866 --set xrpc_port=49469 --set monet_prompt= --trace "--dbname=mTests_tests_BugTracker" "--dbinit=debugmask(and(debugmask(),xor(INT_MAX,8+2))); module( pathfinder);" ; echo ; echo Over.. -+# 18:52:05 > -+ -+# MonetDB Server v4.38.1 -+# based on GDK v1.38.2 -+# Copyright (c) 1993-July 2008, CWI. All rights reserved. -+# Copyright (c) August 2008-2010, MonetDB B.V.. All rights reserved. -+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs; dynamically linked. -+# Detected 7.751 GiB (8322707
MonetDB: default - merge with Jun2010
Changeset: d1ef8f3c2038 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d1ef8f3c2038 Modified Files: Branch: default Log Message: merge with Jun2010 diffs (19 lines): diff -r f4461e83c0bc -r d1ef8f3c2038 testing/src/Mfilter.py.in --- a/testing/src/Mfilter.py.in Sat Jul 10 08:52:26 2010 +0200 +++ b/testing/src/Mfilter.py.in Sat Jul 10 09:00:54 2010 +0200 @@ -144,6 +144,7 @@ r'^(.*: )(illegal|invalid)( option -- .*)\n', # 23: 3 r'^(01/Jan/1970 01:00:00 shttpd_open_port: bind\(|!ERROR: MAPIlisten:binding to stream socket \()([0-9]+)(\): Address already in use|\) failed)\n', # 24: 3 r'^(!.*Exception:remote\.[^:]*:\(mapi:monetdb://monetdb@)([^/]*)(/mTests_.*\).*)\n', # 25: 3 +r'^(ERROR = !sql_stmt symbol\()(.*)(\)->token = CREATE_SCHEMA)\n', # 26: 3 r'^(.*: at )(\([0-9]+,[0-9]+\-[0-9]+,[0-9]+\))(: .*)\n', # 90: 3 r'^(fatal error|ERROR)(: err:FORG0005, fn:exactly-one called with a sequence containing zero or more than one item..*)()\n',# 99: 3 ])+')', re.MULTILINE) @@ -176,6 +177,7 @@ None, 'invalid', None, # 23: 3 None, '...', None, # 24: 3 None, 'localhost', None, # 25: 3 +None, '...', None, # 26: 3 None, '...', None, # 90: 3 '=ERROR', None, '\n#', # 99: 3 ##'=ERROR', None, ''' ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - merge with Jun2010 (no actual changes)
Changeset: f4461e83c0bc for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f4461e83c0bc Modified Files: sql/src/test/BugTracker-2010/Tests/All sql/src/test/BugTracker-2010/Tests/crashonschema.Bug-2547.sql Branch: default Log Message: merge with Jun2010 (no actual changes) ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - merge with Jun2010 (no actual changes)
Changeset: e04612585fcc for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e04612585fcc Modified Files: Branch: default Log Message: merge with Jun2010 (no actual changes) ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merge with Jun2010 branch.
Changeset: 842285ac27fb for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=842285ac27fb Modified Files: Branch: default Log Message: Merge with Jun2010 branch. Reenable test: it seems to work. diffs (12 lines): diff -r 7d1387facf87 -r 842285ac27fb sql/src/test/BugTracker-2009/Tests/All --- a/sql/src/test/BugTracker-2009/Tests/AllFri Jul 09 16:39:45 2010 +0200 +++ b/sql/src/test/BugTracker-2009/Tests/AllFri Jul 09 17:11:14 2010 +0200 @@ -87,7 +87,7 @@ prepare_commit_execute.SF-2606020 ambiguous_order_by.SF-2827916 except_error_wrong.SF-2808409 -#table-leftovers.SF-2779462 +table-leftovers.SF-2779462 Floating_point_exception.SF-2791356 Division_by_zero_error.SF-2791361 copy_into_error_off_by_one.SF-2833696 ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - merge with Jun2010 (no actual change)
Changeset: 7d1387facf87 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7d1387facf87 Modified Files: MonetDB5/src/mal/mal_authorize.mx Branch: default Log Message: merge with Jun2010 (no actual change) ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - merge with Jun2010
Changeset: 49f343c509d8 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=49f343c509d8
Modified Files:
sql/src/test/BugTracker-2010/Tests/All
sql/src/test/BugTracker-2010/Tests/connectto.Bug-2548.sql
Branch: default
Log Message:
merge with Jun2010
diffs (truncated from 358 to 300 lines):
diff -r 3b9f3349bbaf -r 49f343c509d8 sql/src/test/BugTracker-2010/Tests/All
--- a/sql/src/test/BugTracker-2010/Tests/AllFri Jul 09 13:10:30 2010 +0200
+++ b/sql/src/test/BugTracker-2010/Tests/AllFri Jul 09 13:20:03 2010 +0200
@@ -25,3 +25,4 @@
prepare_statements_crash_server.Bug-2599
and_not_broken.Bug-2602
insert-into-except.Bug-2569
+not-in-union-except-union.Bug-2577
diff -r 3b9f3349bbaf -r 49f343c509d8
sql/src/test/BugTracker-2010/Tests/connectto.Bug-2548.stable.err
--- /dev/null Thu Jan 01 00:00:00 1970 +
+++ b/sql/src/test/BugTracker-2010/Tests/connectto.Bug-2548.stable.err Fri Jul
09 13:20:03 2010 +0200
@@ -0,0 +1,81 @@
+stderr of test 'connectto.Bug-2548` in directory 'src/test/BugTracker-2010`
itself:
+
+
+# 13:12:55 >
+# 13:12:55 > mserver5
"--config=/ufs/manegold/_/scratch0/Monet/HG/Jun2010/prefix./etc/monetdb5.conf"
--debug=10 --set gdk_nr_threads=0 --set
"monet_mod_path=/ufs/manegold/_/scratch0/Monet/HG/Jun2010/prefix./lib64/MonetDB5:/ufs/manegold/_/scratch0/Monet/HG/Jun2010/prefix./lib64/MonetDB5/lib:/ufs/manegold/_/scratch0/Monet/HG/Jun2010/prefix./lib64/MonetDB5/bin"
--set
"gdk_dbfarm=/ufs/manegold/_/scratch0/Monet/HG/Jun2010/prefix./var/MonetDB5/dbfarm"
--set mapi_open=true --set xrpc_open=true --set mapi_port=39884 --set
xrpc_port=41478 --set monet_prompt= --set mal_listing=2 --trace
"--dbname=mTests_src_test_BugTracker-2010" --set mal_listing=0 ; echo ; echo
Over..
+# 13:12:55 >
+
+# builtin opt gdk_arch = 64bitx86_64-unknown-linux-gnu
+# builtin opt gdk_version = 1.38.1
+# builtin opt prefix = /ufs/manegold/_/scratch0/Monet/HG/Jun2010/prefix.
+# builtin opt exec_prefix = ${prefix}
+# builtin opt gdk_dbname = demo
+# builtin opt gdk_dbfarm = ${prefix}/var/MonetDB/dbfarm
+# builtin opt gdk_debug = 0
+# builtin opt gdk_alloc_map = no
+# builtin opt gdk_vmtrim = yes
+# builtin opt monet_admin = adm
+# builtin opt monet_prompt = >
+# builtin opt monet_welcome = yes
+# builtin opt monet_mod_path = ${exec_prefix}/lib64/MonetDB
+# builtin opt monet_daemon = no
+# builtin opt host = localhost
+# builtin opt mapi_port = 5
+# builtin opt mapi_clients = 2
+# builtin opt mapi_open = false
+# builtin opt mapi_autosense = false
+# builtin opt sql_debug = 0
+# builtin opt standoff_ns =
+# builtin opt standoff_start = start
+# builtin opt standoff_end = end
+# config opt prefix = /ufs/manegold/_/scratch0/Monet/HG/Jun2010/prefix.
+# config opt config = ${prefix}/etc/monetdb5.conf
+# config opt prefix = /ufs/manegold/_/scratch0/Monet/HG/Jun2010/prefix.
+# config opt exec_prefix = ${prefix}
+# config opt gdk_dbfarm = ${prefix}/var/MonetDB5/dbfarm
+# config opt monet_mod_path =
${exec_prefix}/lib64/MonetDB5:${exec_prefix}/lib64/MonetDB5/lib:${exec_prefix}/lib64/MonetDB5/bin
+# config opt mero_pidfile = ${prefix}/var/run/MonetDB/merovingian.pid
+# config opt mero_controlport = 50001
+# config opt sql_optimizer = default_pipe
+# config opt minimal_pipe = inline,remap,deadcode,multiplex,garbageCollector
+# config opt default_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mitosis,mergetable,deadcode,commonTerms,joinPath,reorder,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# config opt nov2009_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# config opt replication_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,dataflow,history,replication,multiplex,garbageCollector
+# config opt accumulator_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,accumulators,dataflow,history,multiplex,garbageCollector
+# config opt recycler_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,deadcode,constants,commonTerms,joinPath,deadcode,recycle,reduce,dataflow,history,multiplex,garbageCollector
+# config opt cracker_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,selcrack,deadcode,constants,commonTerms,joinPath,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# config opt sidcrack_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,sidcrack,deadcode,constants,commonTerms,joinPath,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# config opt datacell_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,deadcode,constants,commonTerms,joinPath,datacell,deadcode,reduce,dataflow,history,multiple
MonetDB: default - Merge with Jun2010 branch.
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 - 1.38.3-20100709
+- Rebuilt.
+
* Wed Jun 30 2010 Sjoerd Mullender - 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 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 - 4.38.3-20100709
+- Rebuilt.
+
* Wed Jun 30 2010 Sjoerd Mullender - 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 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 - 5.20.3-20100709
+- Rebuilt.
+
* Thu Jul 01 2010 Fabian Groffen - 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 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.outFri Jul 09
10:41:48 2010 +0200
+++ b/MonetDB5/src/mo
MonetDB: default - Merge with Jun2010 branch.
Changeset: 5362367f63e5 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5362367f63e5
Modified Files:
Branch: default
Log Message:
Merge with Jun2010 branch.
Improve error reporting from SQL dump.
diffs (truncated from 521 to 300 lines):
diff -r ca9420679474 -r 5362367f63e5 clients/src/mapiclient/dump.c
--- a/clients/src/mapiclient/dump.c Thu Jul 08 10:41:48 2010 +0200
+++ b/clients/src/mapiclient/dump.c Thu Jul 08 15:26:11 2010 +0200
@@ -76,33 +76,32 @@
char *sname = NULL;
MapiHdl hdl;
- if ((hdl = mapi_query(mid, "SELECT \"current_schema\"")) == NULL ||
mapi_error(mid)) {
- if (hdl) {
- mapi_explain_query(hdl, stderr);
- mapi_close_handle(hdl);
- } else
- mapi_explain(mid, stderr);
- return NULL;
- }
+ if ((hdl = mapi_query(mid, "SELECT \"current_schema\"")) == NULL ||
mapi_error(mid))
+ goto bailout;
while ((mapi_fetch_row(hdl)) != 0) {
sname = mapi_fetch_field(hdl, 0);
- if (mapi_error(mid)) {
- mapi_explain_query(hdl, stderr);
- mapi_close_handle(hdl);
- return NULL;
- }
+ if (mapi_error(mid))
+ goto bailout;
}
- if (mapi_error(mid)) {
- mapi_explain_query(hdl, stderr);
- mapi_close_handle(hdl);
- return NULL;
- }
+ if (mapi_error(mid))
+ goto bailout;
/* copy before closing the handle */
if (sname)
sname = strdup(sname);
mapi_close_handle(hdl);
return sname;
+
+ bailout:
+ if (hdl) {
+ if (mapi_result_error(hdl))
+ mapi_explain_result(hdl, stderr);
+ else
+ mapi_explain_query(hdl, stderr);
+ mapi_close_handle(hdl);
+ } else
+ mapi_explain(mid, stderr);
+ return NULL;
}
static int
@@ -112,7 +111,6 @@
int cnt, i;
char *query;
size_t maxquerylen = 0;
- int rc = 0;
if (tname != NULL) {
maxquerylen = 1024 + strlen(tname) + strlen(schema);
@@ -175,14 +173,8 @@
"ORDER BY \"fs\".\"name\",\"fkt\".\"name\","
"\"fkk\".\"name\", \"nr\"";
}
- if ((hdl = mapi_query(mid, query)) == NULL || mapi_error(mid)) {
- if (hdl)
- mapi_explain_query(hdl, stderr);
- else
- mapi_explain(mid, stderr);
- rc = 1;
+ if ((hdl = mapi_query(mid, query)) == NULL || mapi_error(mid))
goto bailout;
- }
cnt = mapi_fetch_row(hdl);
while (cnt != 0) {
char *c_psname = mapi_fetch_field(hdl, 0);
@@ -197,12 +189,8 @@
char **fkeys, **pkeys;
int nkeys = 0;
- if (mapi_error(mid)) {
- mapi_explain_query(hdl, stderr);
- mapi_close_handle(hdl);
- rc = 1;
+ if (mapi_error(mid))
goto bailout;
- }
assert(strcmp(c_nr, "0") == 0);
(void) c_nr;/* pacify compilers in case assertions are
disabled */
nkeys = 1;
@@ -263,24 +251,29 @@
if (tname == NULL)
stream_printf(toConsole, ";\n");
- if (stream_errnr(toConsole)) {
- rc = 1;
+ if (stream_errnr(toConsole))
goto bailout;
- }
}
- if (mapi_error(mid)) {
- mapi_explain_query(hdl, stderr);
- rc = 1;
- }
+ if (mapi_error(mid))
+ goto bailout;
+ if (hdl)
+ mapi_close_handle(hdl);
+ return 0;
bailout:
- if (hdl)
+ if (hdl) {
+ if (mapi_result_error(hdl))
+ mapi_explain_result(hdl, stderr);
+ else if (mapi_error(mid))
+ mapi_explain_query(hdl, stderr);
mapi_close_handle(hdl);
+ } else if (mapi_error(mid))
+ mapi_explain(mid, stderr);
if (query != NULL && maxquerylen != 0)
free(query);
- return rc;
+ return 1;
}
int
@@ -296,7 +289,6 @@
int cap;
#define CAP(X) ((cap = (int) (X)) < 0 ? 0 : cap)
-
if (schema == NULL) {
if ((sname = strchr(tname, '.')) != NULL) {
size_t len = sname - tname;
@@ -322,20 +314,14 @@
"AND \"t\".\"name\" = '%s'",
schema, tname);
- if ((hdl = mapi_query(mid, query)) == NULL || mapi_error(mid)) {
- if (hdl)
-
MonetDB: default - merge with Jun2010
Changeset: 93a3b7826ee4 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=93a3b7826ee4
Modified Files:
Branch: default
Log Message:
merge with Jun2010
diffs (truncated from 493 to 300 lines):
diff -r 29c41a7efa82 -r 93a3b7826ee4
sql/src/test/BugTracker-2009/Tests/POWER_vs_prod.SF-2596114.stable.out.Debian
--- /dev/null Thu Jan 01 00:00:00 1970 +
+++
b/sql/src/test/BugTracker-2009/Tests/POWER_vs_prod.SF-2596114.stable.out.Debian
Wed Jul 07 23:50:20 2010 +0200
@@ -0,0 +1,74 @@
+stdout of test 'POWER_vs_prod.SF-2596114` in directory
'src/test/BugTracker-2009` itself:
+
+
+# 23:02:29 >
+# 23:02:29 > mserver5
"--config=/ufs/manegold/_/scratch0/Monet/Testing/Stable/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert/etc/monetdb5.conf"
--debug=10 --set gdk_nr_threads=0 --set
"monet_mod_path=/ufs/manegold/_/scratch0/Monet/Testing/Stable/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert/lib64/MonetDB5:/ufs/manegold/_/scratch0/Monet/Testing/Stable/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert/lib64/MonetDB5/lib:/ufs/manegold/_/scratch0/Monet/Testing/Stable/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert/lib64/MonetDB5/bin"
--set
"gdk_dbfarm=/ufs/manegold/_/scratch0/Monet/Testing/Stable/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert/var/MonetDB5/dbfarm"
--set
"sql_logdir=/ufs/manegold/_/scratch0/Monet/Testing/Stable/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert/var/MonetDB5/sql_logs"
--set mapi_open=true --set xrp
c_open=true --set mapi_port=33742 --set xrpc_port=44239 --set monet_prompt=
--trace "--dbname=mTests_src_test_BugTracker-2009" --set mal_listing=0
"--dbinit= include sql;" ; echo ; echo Over..
+# 23:02:29 >
+
+# MonetDB server v5.10.3, based on kernel v1.28.3
+# Serving database 'mTests_src_test_BugTracker-2009', using 4 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
+# 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://rig.ins.cwi.nl:33742/
+# MonetDB/SQL module v2.28.1 loaded
+
+Ready.
+#function user.main():void;
+#clients.quit();
+#end main;
+
+Over..
+
+# 15:46:08 >
+# 15:46:08 > mclient -lsql -i -umonetdb -Pmonetdb --host=rig --port=35464
+# 15:46:08 >
+
+% .explain # table_name
+% mal # name
+% clob # type
+% 0 # length
+function user.s0_1{autoCommit=true}():void;
+_2 := sql.mvc();
+_3:bat[:oid,:dbl] := sql.bind(_2,"sys","sf_2596114","x",0);
+_8:bat[:oid,:dbl] := sql.bind(_2,"sys","sf_2596114","x",2);
+_10 := algebra.kdifference(_3,_8);
+_11 := algebra.kunion(_10,_8);
+_12:bat[:oid,:dbl] := sql.bind(_2,"sys","sf_2596114","x",1);
+_14 := algebra.kunion(_11,_12);
+_15:bat[:oid,:oid] := sql.bind_dbat(_2,"sys","sf_2596114",1);
+_16 := bat.reverse(_15);
+_17 := algebra.kdifference(_14,_16);
+_18:bat[:oid,:dbl] := batmmath.pow(_17,2);
+_19 := sql.resultSet(1,1,_18);
+sql.rsColumn(_19,"sys.","power_x","double",53,0,_18);
+_25 := io.stdout();
+sql.exportResult(_25,_19);
+end s0_1;
+% .explain # table_name
+% mal # name
+% clob # type
+% 0 # length
+function user.s1_1{autoCommit=true}():void;
+_2 := sql.mvc();
+_3:bat[:oid,:dbl] := sql.bind(_2,"sys","sf_2596114","x",0);
+_8:bat[:oid,:dbl] := sql.bind(_2,"sys","sf_2596114","x",2);
+_10 := algebra.kdifference(_3,_8);
+_11 := algebra.kunion(_10,_8);
+_12:bat[:oid,:dbl] := sql.bind(_2,"sys","sf_2596114","x",1);
+_14 := algebra.kunion(_11,_12);
+_15:bat[:oid,:oid] := sql.bind_dbat(_2,"sys","sf_2596114",1);
+_16 := bat.reverse(_15);
+_17 := algebra.kdifference(_14,_16);
+_18:bat[:oid,:dbl] := batcalc.*(_17,_17);
+_19 := sql.resultSet(1,1,_18);
+sql.rsColumn(_19,"sys.","sql_mul_x","double",53,0,_18);
+_25 := io.stdout();
+sql.exportResult(_25,_19);
+end s1_1;
+
+# 23:02:30 >
+# 23:02:30 > Done.
+# 23:02:30 >
+
diff -r 29c41a7efa82 -r 93a3b7826ee4
sql/src/test/BugTracker-2009/Tests/POWER_vs_prod.SF-2596114.stable.out.Windows
--- /dev/null Thu Jan 01 00:00:00 1970 +
+++
b/sql/src/test/BugTracker-2009/Tests/POWER_vs_prod.SF-2596114.stable.out.Windows
Wed Jul 07 23:50:20 2010 +0200
@@ -0,0 +1,74 @@
+stdout of test 'POWER_vs_prod.SF-2596114` in directory
'src/test/BugTracker-2009` itself:
+
+
+# 23:02:29 >
+# 23:02:29 > mserver5
"--config=/ufs/manegold/_/scratch0/Monet/Testing/Stable/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert/etc/monetdb5.conf"
--debug=10 --set gdk_nr_threads=0 --set
"monet_mod_path=/ufs/manegold/_/scratch0/Monet/Testing/Stable/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert/lib64/MonetDB5:/ufs/manegold/_/scratch0/Monet/Test
MonetDB: default - Merge with Jun2010 branch.
Changeset: 29c41a7efa82 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=29c41a7efa82
Modified Files:
sql/src/test/BugTracker/Tests/local_temp_table.SF-1865953.SQL.bat
sql/src/test/BugTracker/Tests/local_temp_table.SF-1865953.SQL.sh
Branch: default
Log Message:
Merge with Jun2010 branch.
diffs (61 lines):
diff -r 7225d0b0b9ee -r 29c41a7efa82
sql/src/test/BugTracker/Tests/local_temp_table.SF-1865953.SQL.bat
--- a/sql/src/test/BugTracker/Tests/local_temp_table.SF-1865953.SQL.bat Wed Jul
07 18:57:59 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +
@@ -1,14 +0,0 @@
-...@echo off
-
-echo user=monetdb> .monetdb
-echo password=monetdb>>.monetdb
-
-set LANG=en_US.UTF-8
-
-prompt # $t $g
-echo on
-
-call mclient -lsql -h %HOST% -p %MAPIPORT%
%RELSRCDIR%\local_temp_table_data.SF-1865953.sql
-call mclient -lsql -h %HOST% -p %MAPIPORT%
-
-...@del .monetdb
diff -r 7225d0b0b9ee -r 29c41a7efa82
sql/src/test/BugTracker/Tests/local_temp_table.SF-1865953.SQL.py
--- /dev/null Thu Jan 01 00:00:00 1970 +
+++ b/sql/src/test/BugTracker/Tests/local_temp_table.SF-1865953.SQL.py Wed Jul
07 21:11:15 2010 +0200
@@ -0,0 +1,21 @@
+import os, sys, time
+from MonetDBtesting import process
+
+RELSRCDIR = os.environ['RELSRCDIR']
+TSTDB = os.environ['TSTDB']
+
+def client(args):
+t = time.strftime('# %H:%M:%S >',time.localtime(time.time()))
+Mlog = "\n%s\n%s mclient %s\n%s\n\n" % (t, t, ' '.join(args), t)
+sys.stdout.write(Mlog)
+sys.stdout.flush()
+sys.stderr.write(Mlog)
+sys.stderr.flush()
+clt = process.client('sql', args = args)
+clt.communicate()
+
+os.environ['LANG'] = 'en_US.UTF-8'
+
+client(['-d', TSTDB,
+os.path.join(RELSRCDIR, 'local_temp_table_data.SF-1865953.sql')])
+client(['-d', TSTDB])
diff -r 7225d0b0b9ee -r 29c41a7efa82
sql/src/test/BugTracker/Tests/local_temp_table.SF-1865953.SQL.sh
--- a/sql/src/test/BugTracker/Tests/local_temp_table.SF-1865953.SQL.sh Wed Jul
07 18:57:59 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-cat << EOF > .monetdb
-user=monetdb
-password=monetdb
-EOF
-
-LANG="en_US.UTF-8"
-export LANG
-
-Mlog -x "$MTIMEOUT mclient -lsql -h $HOST -p $MAPIPORT -d ${TSTDB}
\"$RELSRCDIR/local_temp_table_data.SF-1865953.sql\""
-Mlog -x "$MTIMEOUT mclient -lsql -h $HOST -p $MAPIPORT -d ${TSTDB}"
-
-rm -f .monetdb
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - merge with Jun2010
Changeset: 7225d0b0b9ee for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7225d0b0b9ee Modified Files: Branch: default Log Message: merge with Jun2010 diffs (6 lines): diff -r 38307eba0c23 -r 7225d0b0b9ee sql/src/test/xquery/Tests/create.timeout --- a/sql/src/test/xquery/Tests/create.timeout Wed Jul 07 18:56:29 2010 +0200 +++ b/sql/src/test/xquery/Tests/create.timeout Wed Jul 07 18:57:59 2010 +0200 @@ -1,1 +1,1 @@ -2 +3 ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - merge with Jun2010
Changeset: 38307eba0c23 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=38307eba0c23 Modified Files: Branch: default Log Message: merge with Jun2010 diffs (10 lines): diff -r b4eababe2eea -r 38307eba0c23 sql/src/test/xquery/Tests/drop.reqtests --- /dev/null Thu Jan 01 00:00:00 1970 + +++ b/sql/src/test/xquery/Tests/drop.reqtests Wed Jul 07 18:56:29 2010 +0200 @@ -0,0 +1,1 @@ +create diff -r b4eababe2eea -r 38307eba0c23 sql/src/test/xquery/Tests/q01.reqtests --- /dev/null Thu Jan 01 00:00:00 1970 + +++ b/sql/src/test/xquery/Tests/q01.reqtestsWed Jul 07 18:56:29 2010 +0200 @@ -0,0 +1,1 @@ +create ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - merge with Jun2010
Changeset: b4eababe2eea for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b4eababe2eea Modified Files: Branch: default Log Message: merge with Jun2010 diffs (25 lines): diff -r db83e5b5ae14 -r b4eababe2eea sql/src/test/BugTracker/Tests/local_temp_table.SF-1865953.SQL.bat --- a/sql/src/test/BugTracker/Tests/local_temp_table.SF-1865953.SQL.bat Wed Jul 07 18:10:44 2010 +0200 +++ b/sql/src/test/BugTracker/Tests/local_temp_table.SF-1865953.SQL.bat Wed Jul 07 18:45:56 2010 +0200 @@ -1,2 +1,14 @@ -...@call mclient -lsql -umonetdb -Pmonetdb -h %HOST% -p %MAPIPORT% %RELSRCDIR%\local_temp_table_data.SF-1865953.sql -...@call mclient -lsql -umonetdb -Pmonetdb -h %HOST% -p %MAPIPORT% +...@echo off + +echo user=monetdb> .monetdb +echo password=monetdb>>.monetdb + +set LANG=en_US.UTF-8 + +prompt # $t $g +echo on + +call mclient -lsql -h %HOST% -p %MAPIPORT% %RELSRCDIR%\local_temp_table_data.SF-1865953.sql +call mclient -lsql -h %HOST% -p %MAPIPORT% + +...@del .monetdb diff -r db83e5b5ae14 -r b4eababe2eea sql/src/test/BugTracker/Tests/with_row_number.SF-1898089.timeout --- /dev/null Thu Jan 01 00:00:00 1970 + +++ b/sql/src/test/BugTracker/Tests/with_row_number.SF-1898089.timeout Wed Jul 07 18:45:56 2010 +0200 @@ -0,0 +1,1 @@ +2 ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - merge with Jun2010: disable mitosis to ensure...
Changeset: db83e5b5ae14 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=db83e5b5ae14 Modified Files: sql/src/test/Tests/trace.stable.out Branch: default Log Message: merge with Jun2010: disable mitosis to ensure deterministic trace output diffs (21 lines): diff -r 3ba6226a62e6 -r db83e5b5ae14 sql/src/test/Tests/trace.sql --- a/sql/src/test/Tests/trace.sql Wed Jul 07 17:59:42 2010 +0200 +++ b/sql/src/test/Tests/trace.sql Wed Jul 07 18:10:44 2010 +0200 @@ -1,4 +1,4 @@ -set optimizer='default_pipe'; -- to avoid different answers +set optimizer='nov2009_pipe'; -- disable mitosis to avoid different answers set trace = 'none'; -- non-documented feature to not get any trace output create function tracelog() diff -r 3ba6226a62e6 -r db83e5b5ae14 sql/src/test/Tests/trace.stable.out --- a/sql/src/test/Tests/trace.stable.out Wed Jul 07 17:59:42 2010 +0200 +++ b/sql/src/test/Tests/trace.stable.out Wed Jul 07 18:10:44 2010 +0200 @@ -35,7 +35,7 @@ % L2 # name % wrd # type % 2 # length -[ 42 ] +[ 18 ] # 11:14:41 > # 11:14:41 > Done. ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - merge with Jun2010: make sure we (try to) run...
Changeset: 3ba6226a62e6 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3ba6226a62e6 Modified Files: Branch: default Log Message: merge with Jun2010: make sure we (try to) run ODBC tests only if we do have ODBC diffs (162 lines): diff -r 46a74207c25d -r 3ba6226a62e6 buildtools/conf/winrules.msc --- a/buildtools/conf/winrules.msc Wed Jul 07 17:30:06 2010 +0200 +++ b/buildtools/conf/winrules.msc Wed Jul 07 17:59:42 2010 +0200 @@ -285,6 +285,9 @@ !IFDEF HAVE_NETCDF HAVE_NETCDF_FALSE=^# !ENDIF +!IFDEF HAVE_ODBC +HAVE_ODBC_FALSE=^# +!ENDIF !IFDEF HAVE_PCRE HAVE_PCRE_FALSE=^# !ENDIF @@ -345,6 +348,7 @@ "HAVE_MONETDB5_XML_FALSE=$(HAVE_MONETDB5_XML_FALSE)" \ "HAVE_NETCDF_FALSE=$(HAVE_NETCDF_FALSE)" \ "HAVE_OPENSSL_FALSE=$(HAVE_OPENSSL_FALSE)" \ + "HAVE_ODBC_FALSE=$(HAVE_ODBC_FALSE)" \ "HAVE_PCRE_FALSE=$(HAVE_PCRE_FALSE)" \ "HAVE_PERL_DEVEL_FALSE=$(HAVE_PERL_DEVEL_FALSE)" \ "HAVE_PERL_FALSE=$(HAVE_PERL_FALSE)" \ diff -r 46a74207c25d -r 3ba6226a62e6 clients/conf/Tests/monetdb-clients-conds.stable.out.32bit --- a/clients/conf/Tests/monetdb-clients-conds.stable.out.32bit Wed Jul 07 17:30:06 2010 +0200 +++ b/clients/conf/Tests/monetdb-clients-conds.stable.out.32bit Wed Jul 07 17:59:42 2010 +0200 @@ -16,6 +16,7 @@ HAVE_BUILDTOOLS=# HAVE_EXTRA_MK= HAVE_MONETDB=# +HAVE_ODBC=# HAVE_PCRE=# HAVE_PERL_DEVEL=# HAVE_PERL=# diff -r 46a74207c25d -r 3ba6226a62e6 clients/conf/Tests/monetdb-clients-conds.stable.out.64bit --- a/clients/conf/Tests/monetdb-clients-conds.stable.out.64bit Wed Jul 07 17:30:06 2010 +0200 +++ b/clients/conf/Tests/monetdb-clients-conds.stable.out.64bit Wed Jul 07 17:59:42 2010 +0200 @@ -16,6 +16,7 @@ HAVE_BUILDTOOLS=# HAVE_EXTRA_MK= HAVE_MONETDB=# +HAVE_ODBC=# HAVE_PCRE=# HAVE_PERL_DEVEL=# HAVE_PERL=# diff -r 46a74207c25d -r 3ba6226a62e6 clients/conf/Tests/monetdb-clients-conds.stable.out.64bit.STATIC --- a/clients/conf/Tests/monetdb-clients-conds.stable.out.64bit.STATIC Wed Jul 07 17:30:06 2010 +0200 +++ b/clients/conf/Tests/monetdb-clients-conds.stable.out.64bit.STATIC Wed Jul 07 17:59:42 2010 +0200 @@ -16,6 +16,7 @@ HAVE_BUILDTOOLS=# HAVE_EXTRA_MK= HAVE_MONETDB=# +HAVE_ODBC=# HAVE_PCRE=# HAVE_PERL_DEVEL=# HAVE_PERL=# diff -r 46a74207c25d -r 3ba6226a62e6 clients/conf/Tests/monetdb-clients-conds.stable.out.Darwin.64bit --- a/clients/conf/Tests/monetdb-clients-conds.stable.out.Darwin.64bit Wed Jul 07 17:30:06 2010 +0200 +++ b/clients/conf/Tests/monetdb-clients-conds.stable.out.Darwin.64bit Wed Jul 07 17:59:42 2010 +0200 @@ -16,6 +16,7 @@ HAVE_BUILDTOOLS=# HAVE_EXTRA_MK= HAVE_MONETDB=# +HAVE_ODBC= HAVE_PCRE=# HAVE_PERL_DEVEL=# HAVE_PERL=# diff -r 46a74207c25d -r 3ba6226a62e6 clients/conf/Tests/monetdb-clients-conds.stable.out.RedHat4WS.64bit --- a/clients/conf/Tests/monetdb-clients-conds.stable.out.RedHat4WS.64bit Wed Jul 07 17:30:06 2010 +0200 +++ b/clients/conf/Tests/monetdb-clients-conds.stable.out.RedHat4WS.64bit Wed Jul 07 17:59:42 2010 +0200 @@ -16,6 +16,7 @@ HAVE_BUILDTOOLS=# HAVE_EXTRA_MK= HAVE_MONETDB=# +HAVE_ODBC=# HAVE_PCRE=# HAVE_PERL_DEVEL=# HAVE_PERL=# diff -r 46a74207c25d -r 3ba6226a62e6 clients/conf/Tests/monetdb-clients-conds.stable.out.SunOS5.11.32bit --- a/clients/conf/Tests/monetdb-clients-conds.stable.out.SunOS5.11.32bit Wed Jul 07 17:30:06 2010 +0200 +++ b/clients/conf/Tests/monetdb-clients-conds.stable.out.SunOS5.11.32bit Wed Jul 07 17:59:42 2010 +0200 @@ -16,6 +16,7 @@ HAVE_BUILDTOOLS=# HAVE_EXTRA_MK= HAVE_MONETDB=# +HAVE_ODBC=# HAVE_PCRE= HAVE_PERL_DEVEL=# HAVE_PERL=# diff -r 46a74207c25d -r 3ba6226a62e6 clients/conf/Tests/monetdb-clients-conds.stable.out.SunOS5.11.64bit --- a/clients/conf/Tests/monetdb-clients-conds.stable.out.SunOS5.11.64bit Wed Jul 07 17:30:06 2010 +0200 +++ b/clients/conf/Tests/monetdb-clients-conds.stable.out.SunOS5.11.64bit Wed Jul 07 17:59:42 2010 +0200 @@ -16,6 +16,7 @@ HAVE_BUILDTOOLS=# HAVE_EXTRA_MK= HAVE_MONETDB=# +HAVE_ODBC=# HAVE_PCRE=# HAVE_PERL_DEVEL=# HAVE_PERL=# diff -r 46a74207c25d -r 3ba6226a62e6 clients/conf/Tests/monetdb-clients-conds.stable.out.Windows.32bit --- a/clients/conf/Tests/monetdb-clients-conds.stable.out.Windows.32bit Wed Jul 07 17:30:06 2010 +0200 +++ b/clients/conf/Tests/monetdb-clients-conds.stable.out.Windows.32bit Wed Jul 07 17:59:42 2010 +0200 @@ -16,6 +16,7 @@ HAVE_BUILDTOOLS=# HAVE_EXTRA_MK= HAVE_MONETDB=# +HAVE_ODBC=# HAVE_PCRE=# HAVE_PERL_DEVEL=# HAVE_PERL=# diff -r 46a74207c25d -r 3ba6226a62e6 clients/conf/Tests/monetdb-clients-conds.stable.out.Windows.64bit --- a/clients/conf/Tests/monetdb-clients-conds.stable.out.Windows.64bit Wed Jul 07 17:30:06 2010 +0200 +++ b/clients/conf/Tests/monetdb-clients-conds.stable.out.Windows.64bit Wed Jul 07 17:59:42 2010 +0200 @@ -16,6 +16,7 @@ HAVE_BUILDTOOLS=# HAVE_EXTRA_MK= HAVE_MONETDB=# +HAVE_ODBC=# HAVE_PCRE=# HAVE_PERL_DEVEL=# HAVE_PERL=# diff -r 46a74207c25d -r
