Changeset: 894c03bbcf3c for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=894c03bbcf3c
Added Files:
sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.stable.out.single
Modified Files:
clients/mapiclient/mclient.c
debian/changelog
sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.single
sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out.32bit
tools/merovingian/daemon/forkmserver.c
tools/merovingian/daemon/merovingian.c
Branch: default
Log Message:
Merge with Oct2014 branch.
diffs (truncated from 406 to 300 lines):
diff --git a/clients/mapiclient/mclient.c b/clients/mapiclient/mclient.c
--- a/clients/mapiclient/mclient.c
+++ b/clients/mapiclient/mclient.c
@@ -1598,7 +1598,7 @@ format_result(Mapi mid, MapiHdl hdl, cha
mnstr_printf(toConsole,
LLFMT " affected row%s",
aff,
- aff == 1 ? "s" : "");
+ aff != 1 ? "s" : "");
if (lid != -1) {
mnstr_printf(toConsole,
", last generated key: "
diff --git a/debian/changelog b/debian/changelog
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,12 +7,6 @@ monetdb (11.19.3-20141028) unstable; urg
monetdb (11.19.1-20141024) unstable; urgency=low
* Rebuilt.
-
- -- Sjoerd Mullender <[email protected]> Fri, 24 Oct 2014 09:22:27 +0200
-
-monetdb (11.19.1-20141024) unstable; urgency=low
-
- * Rebuilt.
* BZ#2618: Implement master slave scheme
* BZ#2945: evaluation of SQL "between SYMMETRIC" requires MAL iterator
because there is no (bulk) MIN/MAX(a,b)
@@ -212,12 +206,6 @@ monetdb (11.19.1-20141024) unstable; urg
monetdb (11.17.21-20140725) unstable; urgency=low
* Rebuilt.
-
- -- Sjoerd Mullender <[email protected]> Fri, 25 Jul 2014 15:09:55 +0200
-
-monetdb (11.17.21-20140725) unstable; urgency=low
-
- * Rebuilt.
* BZ#3519: Uppercase TRUE/FALSE strings cannot be converted to boolean
values
@@ -226,12 +214,6 @@ monetdb (11.17.21-20140725) unstable; ur
monetdb (11.17.19-20140722) unstable; urgency=low
* Rebuilt.
-
- -- Sjoerd Mullender <[email protected]> Tue, 22 Jul 2014 11:42:09 +0200
-
-monetdb (11.17.19-20140722) unstable; urgency=low
-
- * Rebuilt.
* BZ#3487: dead link to "Professional services"
* BZ#3500: MonetDB driver wants an empty string for SQLTables and
SQLColumns API calls, where other drivers expect NULL
@@ -251,12 +233,6 @@ monetdb (11.17.19-20140722) unstable; ur
monetdb (11.17.17-20140514) unstable; urgency=low
* Rebuilt.
-
- -- Sjoerd Mullender <[email protected]> Wed, 14 May 2014 09:55:30 +0200
-
-monetdb (11.17.17-20140514) unstable; urgency=low
-
- * Rebuilt.
* BZ#3482: Crossproduct error
-- Sjoerd Mullender <[email protected]> Wed, 14 May 2014 09:55:28 +0200
@@ -264,12 +240,6 @@ monetdb (11.17.17-20140514) unstable; ur
monetdb (11.17.15-20140508) unstable; urgency=low
* Rebuilt.
-
- -- Sjoerd Mullender <[email protected]> Thu, 08 May 2014 14:21:39 +0200
-
-monetdb (11.17.15-20140508) unstable; urgency=low
-
- * Rebuilt.
* BZ#3424: numeric values at the front of strings determines whether
CAST works successfully
* BZ#3439: Python driver drops milliseconds from timestamps
@@ -321,12 +291,6 @@ monetdb (11.17.15-20140508) unstable; ur
monetdb (11.17.13-20140306) unstable; urgency=low
* Rebuilt.
-
- -- Sjoerd Mullender <[email protected]> Thu, 06 Mar 2014 11:48:51 +0100
-
-monetdb (11.17.13-20140306) unstable; urgency=low
-
- * Rebuilt.
* BZ#3452: ODBC driver build fails on Mac OS X due to a conflicting
types for the SQLColAttribute with the unixODBC library
@@ -335,12 +299,6 @@ monetdb (11.17.13-20140306) unstable; ur
monetdb (11.17.11-20140303) unstable; urgency=low
* Rebuilt.
-
- -- Sjoerd Mullender <[email protected]> Mon, 03 Mar 2014 12:31:43 +0100
-
-monetdb (11.17.11-20140303) unstable; urgency=low
-
- * Rebuilt.
* BZ#3442: COPY INTO ... LOCKED reports incorrect count
* BZ#3443: DROP INDEX crashes server with BATsubselect: invalid argument:
b must have a dense head
@@ -364,12 +322,6 @@ monetdb (11.17.11-20140303) unstable; ur
monetdb (11.17.9-20140213) unstable; urgency=low
* Rebuilt.
-
- -- Sjoerd Mullender <[email protected]> Thu, 13 Feb 2014 12:40:16 +0100
-
-monetdb (11.17.9-20140213) unstable; urgency=low
-
- * Rebuilt.
* BZ#3435: INDEX prevents JOIN from discovering matches
-- Sjoerd Mullender <[email protected]> Thu, 13 Feb 2014 12:40:14 +0100
@@ -377,12 +329,6 @@ monetdb (11.17.9-20140213) unstable; urg
monetdb (11.17.7-20140207) unstable; urgency=low
* Rebuilt.
-
- -- Sjoerd Mullender <[email protected]> Fri, 07 Feb 2014 12:53:25 +0100
-
-monetdb (11.17.7-20140207) unstable; urgency=low
-
- * Rebuilt.
* BZ#3436: COPY INTO from file containing leading Byte Order Mark (BOM)
causes corruption
@@ -391,12 +337,6 @@ monetdb (11.17.7-20140207) unstable; urg
monetdb (11.17.5-20140206) unstable; urgency=low
* Rebuilt.
-
- -- Sjoerd Mullender <[email protected]> Thu, 06 Feb 2014 10:27:38 +0100
-
-monetdb (11.17.5-20140206) unstable; urgency=low
-
- * Rebuilt.
* BZ#3420: Database does not start after upgrade
* BZ#3425: Temporal extraction glitches
* BZ#3427: Consistent use of current_timestamp and now()
@@ -412,12 +352,6 @@ monetdb (11.17.5-20140206) unstable; urg
monetdb (11.17.3-20140125) unstable; urgency=low
* Rebuilt.
-
- -- Sjoerd Mullender <[email protected]> Sat, 25 Jan 2014 14:06:29 +0100
-
-monetdb (11.17.3-20140125) unstable; urgency=low
-
- * Rebuilt.
* BZ#3418: Segmentation fault on a query from table expression
* BZ#3419: Database does not start after upgrade
* BZ#3423: Group by alias with distinct count doesn't work
@@ -427,12 +361,6 @@ monetdb (11.17.3-20140125) unstable; urg
monetdb (11.17.1-20140114) unstable; urgency=low
* Rebuilt.
-
- -- Sjoerd Mullender <[email protected]> Tue, 14 Jan 2014 14:39:05 +0100
-
-monetdb (11.17.1-20140114) unstable; urgency=low
-
- * Rebuilt.
* BZ#3040: Wrong NULL behavior in EXCEPT and INTERSECT
* BZ#3092: ODBC client doesn't support scalar function escape
* BZ#3198: SIGSEGV insert_string_bat (b=0x7fffe419d0a0, n=0x7fffc4006010,
@@ -518,12 +446,6 @@ monetdb (11.17.1-20140114) unstable; urg
monetdb (11.15.19-20131120) unstable; urgency=low
* Rebuilt.
-
- -- Sjoerd Mullender <[email protected]> Wed, 20 Nov 2013 12:27:16 +0100
-
-monetdb (11.15.19-20131120) unstable; urgency=low
-
- * Rebuilt.
* BZ#3243: Segmentation fault (possible data corruption) after clean
shutdown
* BZ#3258: Scheduling issues
@@ -608,12 +530,6 @@ monetdb (11.15.19-20131120) unstable; ur
monetdb (11.15.17-20131008) unstable; urgency=low
* Rebuilt.
-
- -- Hannes Muehleisen <[email protected]> Tue, 08 Oct 2013 16:12:02 +0200
-
-monetdb (11.15.17-20131008) unstable; urgency=low
-
- * Rebuilt.
* BZ#3323: Heapcache bugs/performance issues
* BZ#3331: SAMPLE will return same result every time.
* BZ#3356: DatabaseMetaData.getColumns() doesn't work correctly when
diff --git a/sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.single
b/sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.single
--- a/sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.single
+++ b/sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.single
@@ -48,13 +48,13 @@ Ready.
function user.s2_1():void;
X_1 := sql.mvc();
X_2:bat[:oid,:oid] := sql.tid(X_1,"sys","treeitems");
- X_5 := sql.bind(X_1,"sys","treeitems","pre",0);
+ X_5:bat[:oid,:lng] := sql.bind(X_1,"sys","treeitems","pre",0);
X_8 := algebra.leftfetchjoin(X_2,X_5);
- X_9 := sql.bind(X_1,"sys","treeitems","size",0);
+ X_9:bat[:oid,:lng] := sql.bind(X_1,"sys","treeitems","size",0);
X_11 := algebra.leftfetchjoin(X_2,X_9);
X_12:bat[:oid,:lng] := batcalc.+(X_8,X_11);
(X_13,r1_18) := algebra.join(X_8,X_8,X_12,true,true);
- X_16 := sql.bind(X_1,"sys","treeitems","subject",0);
+ X_16:bat[:oid,:int] := sql.bind(X_1,"sys","treeitems","subject",0);
X_18 := algebra.leftfetchjoin(X_2,X_16);
X_19 := algebra.leftfetchjoin(r1_18,X_18);
X_20 := algebra.leftfetchjoin(X_13,X_18);
diff --git
a/sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.stable.out.single
b/sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.stable.out.single
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.stable.out.single
@@ -0,0 +1,85 @@
+stdout of test 'nil_2dec_lng.Bug-3592` in directory 'sql/test/BugTracker-2014`
itself:
+
+
+# 23:28:04 >
+# 23:28:04 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=38459" "--set"
"mapi_usock=/var/tmp/mtest-19113/.s.monetdb.38459" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/export/scratch1/mk/Oct2014//Linux/var/MonetDB/mTests_sql_test_BugTracker-2014"
"--set" "mal_listing=0" "--set" "embedded_r=yes"
+# 23:28:04 >
+
+# MonetDB 5 server v11.19.0
+# This is an unreleased version
+# Serving database 'mTests_sql_test_BugTracker-2014', using 8 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
+# Found 15.590 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2014 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://vienna.ins.cwi.nl:38459/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-19113/.s.monetdb.38459
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+# MonetDB/R module loaded
+
+Ready.
+
+# 23:28:04 >
+# 23:28:04 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-19113" "--port=38459"
+# 23:28:04 >
+
+#create table foo_nil_2dec (t timestamp,v decimal(18,9));
+#insert into foo_nil_2dec values (now(),42);
+[ 1 ]
+#insert into foo_nil_2dec values (now(),43);
+[ 1 ]
+#select (t-(select timestamp '1970-1-1')),v from foo_nil_2dec union all select
(t-(select timestamp '1970-1-1')),null from foo_nil_2dec;
+% .L5, .L5 # table_name
+% L2, v # name
+% bigint, decimal # type
+% 13, 20 # length
+[ 1412467200000, 42.000000000 ]
+[ 1412467200000, 43.000000000 ]
+[ 1412467200000, NULL ]
+[ 1412467200000, NULL ]
+#explain select (t-(select timestamp '1970-1-1')),v from foo_nil_2dec union
all select (t-(select timestamp '1970-1-1')),null from foo_nil_2dec;
+% .explain # table_name
+% mal # name
+% clob # type
+% 187 # length
+function user.s5_1{autoCommit=true}(A0:timestamp,A1:timestamp,A2:void):void;
+ X_6:bat[:oid,:lng] := bat.new(nil:oid,nil:lng);
+ X_5 := sql.mvc();
+ X_9:bat[:oid,:oid] := sql.tid(X_5,"sys","foo_nil_2dec");
+ X_12:bat[:oid,:timestamp] := sql.bind(X_5,"sys","foo_nil_2dec","t",0);
+ (X_15,r1_15) := sql.bind(X_5,"sys","foo_nil_2dec","t",2);
+ X_18:bat[:oid,:timestamp] := sql.bind(X_5,"sys","foo_nil_2dec","t",1);
+ X_20 := sql.delta(X_12,X_15,r1_15,X_18);
+ X_21 := algebra.leftfetchjoin(X_9,X_20);
+ X_22 := calc.timestamp(A0,7);
+ X_24 := algebra.project(X_21,X_22);
+ X_25:bat[:oid,:lng] := batmtime.diff(X_21,X_24);
+ X_26 := bat.append(X_6,X_25,true);
+ X_27 := calc.timestamp(A1,7);
+ X_28 := algebra.project(X_21,X_27);
+ X_29:bat[:oid,:lng] := batmtime.diff(X_21,X_28);
+ X_30 := bat.append(X_26,X_29,true);
+ X_32:bat[:oid,:lng] := bat.new(nil:oid,nil:lng);
+ X_35:bat[:oid,:lng] := sql.bind(X_5,"sys","foo_nil_2dec","v",0);
+ (X_40,r1_51) := sql.bind(X_5,"sys","foo_nil_2dec","v",2);
+ X_43:bat[:oid,:lng] := sql.bind(X_5,"sys","foo_nil_2dec","v",1);
+ X_45 := sql.delta(X_35,X_40,r1_51,X_43);
+ X_46 := algebra.leftfetchjoin(X_9,X_45);
+ X_47 := bat.append(X_32,X_46,true);
+ X_48 := algebra.project(X_21,A2);
+ X_49:bat[:oid,:lng] := mal.manifold("calc","lng",X_48,18,9);
+ X_54 := bat.append(X_47,X_49,true);
+ X_55 := sql.resultSet(2,1,X_30);
+ sql.rsColumn(X_55,".L5","L2","bigint",64,0,X_30);
+ sql.rsColumn(X_55,".L5","v","decimal",18,9,X_54);
+ X_63 := io.stdout();
+ sql.exportResult(X_63,X_55);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
