Changeset: eb7ba9cdd336 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=eb7ba9cdd336
Modified Files:
clients/Tests/exports.stable.out
configure.ag
monetdb5/modules/mal/Tests/inspect05.stable.out.Windows
Branch: default
Log Message:
Merge with Dec2011 branch.
diffs (150 lines):
diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -4598,7 +4598,6 @@ str MTIMEdate_GT(bit *ret, date *v, date
str MTIMEdate_LE(bit *ret, date *v, date *w);
str MTIMEdate_LT(bit *ret, date *v, date *w);
str MTIMEdate_NEQ(bit *ret, date *v, date *w);
-str MTIMEdate_add_month_interval_wrap(date *ret, date *t, int *months);
str MTIMEdate_add_msec_interval_lng_wrap(date *ret, date *t, lng *msec);
str MTIMEdate_add_sec_interval_wrap(date *ret, date *t, int *sec);
str MTIMEdate_adddays(date *ret, date *v, int *delta);
@@ -6354,7 +6353,6 @@ str takeRef;
str thetajoinRef;
str thetaselectRef;
str thetauselectRef;
-int timestamp_diff(lng *ret, timestamp *v1, timestamp *v2);
int timestamp_fromstr(str buf, int *len, timestamp **ret);
timestamp *timestamp_nil;
int timestamp_tostr(str *buf, int *len, timestamp *val);
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -2799,6 +2799,7 @@ AC_SUBST(libxml2version)
dnl provide different versions of the paths derived above
if test "${prefix}x" = "NONEx"; then
+ prefix="${ac_default_prefix}"
Xprefix="`$translatepath "$Qprefix"`"
QXprefix="`echo "$Xprefix" | sed 's/\\\\/\\\\\\\\/g'`"
else
diff --git a/monetdb5/modules/mal/Tests/inspect05.stable.out.Windows
b/monetdb5/modules/mal/Tests/inspect05.stable.out.Windows
old mode 100644
new mode 100755
--- a/monetdb5/modules/mal/Tests/inspect05.stable.out.Windows
+++ b/monetdb5/modules/mal/Tests/inspect05.stable.out.Windows
@@ -3193,7 +3193,7 @@ end main;
[ "date", "command", "mtime", "(s:str):date
",
"MTIMEdate_fromstr;"
]
[ "date", "command", "mtime", "(X_1:void):date ",
"MTIMEnil2date;" ]
[ "date", "command", "mtime", "(X_1:date):date ",
"MTIMEdate2date;" ]
-[ "date_add_month_interval", "command", "mtime",
"(t:date,s:int):date ",
"MTIMEdate_add_month_interval_wrap;" ]
+[ "date_add_month_interval", "command", "mtime",
"(t:date,s:int):date ",
"MTIMEdate_addmonths;"
]
[ "date_add_msec_interval", "command", "mtime", "(t:date,ms:lng):date
",
"MTIMEdate_add_msec_interval_lng_wrap;" ]
[ "date_add_sec_interval", "command", "mtime",
"(t:date,s:int):date ",
"MTIMEdate_add_sec_interval_wrap;" ]
[ "date_sub_msec_interval", "command", "mtime", "(t:date,ms:lng):date
",
"MTIMEdate_sub_msec_interval_lng_wrap;" ]
diff --git a/monetdb5/tests/BugTracker/Tests/All
b/monetdb5/tests/BugTracker/Tests/All
--- a/monetdb5/tests/BugTracker/Tests/All
+++ b/monetdb5/tests/BugTracker/Tests/All
@@ -8,3 +8,4 @@ empty_line_crash.SF-1806638
parser.SF-2051309
mal_var_persistent_over_sessions.SF-2581675
merge-join_properties.SF-2952191
+joinpath-loop.Bug-2965
diff --git a/monetdb5/tests/BugTracker/Tests/joinpath-loop.Bug-2965.mal
b/monetdb5/tests/BugTracker/Tests/joinpath-loop.Bug-2965.mal
new file mode 100644
--- /dev/null
+++ b/monetdb5/tests/BugTracker/Tests/joinpath-loop.Bug-2965.mal
@@ -0,0 +1,13 @@
+a:bat[:oid, :int] := bat.new(:oid, :int);
+b:bat[:oid, :int] := bat.new(:oid, :int);
+c:bat[:oid, :int] := bat.new(:oid, :int);
+bat.append(a, 1);
+bat.append(a, 2);
+bat.append(a, 3);
+bat.append(b, 1);
+bat.append(b, 2);
+bat.append(b, 0);
+bat.append(c, 0);
+bat.append(c, 3);
+bat.append(c, 1);
+algebra.joinPath(a, b, c);
diff --git a/monetdb5/tests/BugTracker/Tests/joinpath-loop.Bug-2965.stable.err
b/monetdb5/tests/BugTracker/Tests/joinpath-loop.Bug-2965.stable.err
new file mode 100644
--- /dev/null
+++ b/monetdb5/tests/BugTracker/Tests/joinpath-loop.Bug-2965.stable.err
@@ -0,0 +1,31 @@
+stderr of test 'joinpath-loop.Bug-2965` in directory 'tests/BugTracker` itself:
+
+
+# 16:23:27 >
+# 16:23:27 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"gdk_dbfarm=/ufs/sjoerd/Monet-candidate/var/MonetDB" "--set" "mapi_open=true"
"--set" "mapi_port=39263" "--set" "monet_prompt=" "--trace" "--forcemito"
"--set" "mal_listing=2" "--dbname=mTests_tests_BugTracker"
"joinpath-loop.Bug-2965.mal"
+# 16:23:27 >
+
+# builtin opt gdk_dbname = demo
+# builtin opt gdk_dbfarm = /ufs/sjoerd/Monet-candidate/var/monetdb5/dbfarm
+# builtin opt gdk_debug = 0
+# builtin opt gdk_alloc_map = no
+# builtin opt gdk_vmtrim = yes
+# builtin opt monet_prompt = >
+# builtin opt monet_daemon = no
+# builtin opt mapi_port = 50000
+# builtin opt mapi_open = false
+# builtin opt mapi_autosense = false
+# builtin opt sql_optimizer = default_pipe
+# builtin opt sql_debug = 0
+# cmdline opt gdk_nr_threads = 0
+# cmdline opt gdk_dbfarm = /ufs/sjoerd/Monet-candidate/var/MonetDB
+# cmdline opt mapi_open = true
+# cmdline opt mapi_port = 39263
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbname = mTests_tests_BugTracker
+
+# 16:23:27 >
+# 16:23:27 > "Done."
+# 16:23:27 >
+
diff --git a/monetdb5/tests/BugTracker/Tests/joinpath-loop.Bug-2965.stable.out
b/monetdb5/tests/BugTracker/Tests/joinpath-loop.Bug-2965.stable.out
new file mode 100644
--- /dev/null
+++ b/monetdb5/tests/BugTracker/Tests/joinpath-loop.Bug-2965.stable.out
@@ -0,0 +1,39 @@
+stdout of test 'joinpath-loop.Bug-2965` in directory 'tests/BugTracker` itself:
+
+
+# 16:23:27 >
+# 16:23:27 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"gdk_dbfarm=/ufs/sjoerd/Monet-candidate/var/MonetDB" "--set" "mapi_open=true"
"--set" "mapi_port=39263" "--set" "monet_prompt=" "--trace" "--forcemito"
"--set" "mal_listing=2" "--dbname=mTests_tests_BugTracker"
"joinpath-loop.Bug-2965.mal"
+# 16:23:27 >
+
+# MonetDB 5 server v11.7.0
+# This is an unreleased version
+# Serving database 'mTests_tests_BugTracker', using 8 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
+# Found 15.662 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2011 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://madrid.ins.cwi.nl:39263/
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+function user.main():void;
+ a:bat[:oid,:int] := bat.new(:oid,:int);
+ b:bat[:oid,:int] := bat.new(:oid,:int);
+ c:bat[:oid,:int] := bat.new(:oid,:int);
+ bat.append(a,1);
+ bat.append(a,2);
+ bat.append(a,3);
+ bat.append(b,1);
+ bat.append(b,2);
+ bat.append(b,0);
+ bat.append(c,0);
+ bat.append(c,3);
+ bat.append(c,1);
+ algebra.joinPath(a,b,c);
+end main;
+!MALException:algebra.joinPath:Type mismatch
+
+# 16:23:27 >
+# 16:23:27 > "Done."
+# 16:23:27 >
+
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
