Changeset: a8df5b7e9b49 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a8df5b7e9b49
Added Files:
sql/test/BugTracker-2016/Tests/update_crash.Bug-3954.sql
sql/test/BugTracker-2016/Tests/update_crash.Bug-3954.stable.err
sql/test/BugTracker-2016/Tests/update_crash.Bug-3954.stable.out
Modified Files:
sql/server/rel_updates.c
sql/test/BugTracker-2016/Tests/All
tools/merovingian/daemon/monetdbd.1.in
Branch: Jun2016
Log Message:
Merge with Jul2015 branch.
diffs (159 lines):
diff --git a/sql/server/rel_updates.c b/sql/server/rel_updates.c
--- a/sql/server/rel_updates.c
+++ b/sql/server/rel_updates.c
@@ -964,6 +964,7 @@ update_table(mvc *sql, dlist *qname, dli
sql->errstr[0] = 0;
sql->session->status = status;
if (single) {
+ rel_val = NULL;
v = rel_value_exp(sql, &r, a,
sql_sel, ek);
} else if (!rel_val && r) {
r = rel_subquery(sql, r, a, ek,
APPLY_LOJ);
diff --git a/sql/test/BugTracker-2016/Tests/All
b/sql/test/BugTracker-2016/Tests/All
--- a/sql/test/BugTracker-2016/Tests/All
+++ b/sql/test/BugTracker-2016/Tests/All
@@ -15,3 +15,4 @@ stream_table_crash.Bug-3952
null_in_null.Bug-3900
rank_rewrite.Bug-3890
HAVE_LIBBZ2?min-max-uuid-column-wrong-results.Bug-3953
+update_crash.Bug-3954
diff --git a/sql/test/BugTracker-2016/Tests/update_crash.Bug-3954.sql
b/sql/test/BugTracker-2016/Tests/update_crash.Bug-3954.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2016/Tests/update_crash.Bug-3954.sql
@@ -0,0 +1,19 @@
+create table temp (t timestamp, sensor integer, val decimal(8,2)) ;
+
+insert into temp values(timestamp '2016-03-13 08:58:14', 1, 23.4);
+
+select * from temp;
+
+create table temp_aggregate(temp_total decimal(8,2), temp_count decimal(8,2));
+insert into temp_aggregate values(0.0,0.0);
+
+create procedure collect()
+begin
+ update temp_aggregate
+ set temp_total = temp_total + (select sum(val) from temp),
+ temp_count = temp_count + (select count(*) from
temp);
+end;
+
+drop procedure collect;
+drop table temp;
+drop table temp_aggregate;
diff --git a/sql/test/BugTracker-2016/Tests/update_crash.Bug-3954.stable.err
b/sql/test/BugTracker-2016/Tests/update_crash.Bug-3954.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2016/Tests/update_crash.Bug-3954.stable.err
@@ -0,0 +1,37 @@
+stderr of test 'update_crash.Bug-3954` in directory 'sql/test/BugTracker-2016`
itself:
+
+
+# 09:50:14 >
+# 09:50:14 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=33995" "--set"
"mapi_usock=/var/tmp/mtest-24151/.s.monetdb.33995" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/home/niels/scratch/rc-monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2016"
"--set" "mal_listing=0" "--set" "embedded_r=yes"
+# 09:50:14 >
+
+# builtin opt gdk_dbpath =
/home/niels/scratch/rc-monetdb/Linux-x86_64/var/monetdb5/dbfarm/demo
+# builtin opt gdk_debug = 0
+# builtin opt gdk_vmtrim = no
+# 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 mapi_open = true
+# cmdline opt mapi_port = 33995
+# cmdline opt mapi_usock = /var/tmp/mtest-24151/.s.monetdb.33995
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbpath =
/home/niels/scratch/rc-monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2016
+# cmdline opt mal_listing = 0
+# cmdline opt embedded_r = yes
+# cmdline opt gdk_debug = 536870922
+
+# 09:50:15 >
+# 09:50:15 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-24151" "--port=33995"
+# 09:50:15 >
+
+
+# 09:50:15 >
+# 09:50:15 > "Done."
+# 09:50:15 >
+
diff --git a/sql/test/BugTracker-2016/Tests/update_crash.Bug-3954.stable.out
b/sql/test/BugTracker-2016/Tests/update_crash.Bug-3954.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2016/Tests/update_crash.Bug-3954.stable.out
@@ -0,0 +1,57 @@
+stdout of test 'update_crash.Bug-3954` in directory 'sql/test/BugTracker-2016`
itself:
+
+
+# 09:50:14 >
+# 09:50:14 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=33995" "--set"
"mapi_usock=/var/tmp/mtest-24151/.s.monetdb.33995" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/home/niels/scratch/rc-monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2016"
"--set" "mal_listing=0" "--set" "embedded_r=yes"
+# 09:50:14 >
+
+# MonetDB 5 server v11.21.12
+# This is an unreleased version
+# Serving database 'mTests_sql_test_BugTracker-2016', using 4 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs and 128bit
integers dynamically linked
+# Found 7.332 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2015 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://localhost.nes.nl:33995/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-24151/.s.monetdb.33995
+# MonetDB/GIS module loaded
+# Start processing logs sql/sql_logs version 52200
+# Start reading the write-ahead log 'sql_logs/sql/log.9'
+# Finished reading the write-ahead log 'sql_logs/sql/log.9'
+# Finished processing logs sql/sql_logs
+# MonetDB/SQL module loaded
+# MonetDB/R module loaded
+
+Ready.
+
+# 09:50:15 >
+# 09:50:15 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-24151" "--port=33995"
+# 09:50:15 >
+
+#create table temp (t timestamp, sensor integer, val decimal(8,2)) ;
+#insert into temp values(timestamp '2016-03-13 08:58:14', 1, 23.4);
+[ 1 ]
+#select * from temp;
+% sys.temp, sys.temp, sys.temp # table_name
+% t, sensor, val # name
+% timestamp, int, decimal # type
+% 26, 1, 10 # length
+[ 2016-03-13 08:58:14.000000, 1, 23.40 ]
+#create table temp_aggregate(temp_total decimal(8,2), temp_count decimal(8,2));
+#insert into temp_aggregate values(0.0,0.0);
+[ 1 ]
+#create procedure collect()
+#begin
+# update temp_aggregate
+# set temp_total = temp_total + (select sum(val) from temp),
+# temp_count = temp_count + (select count(*) from
temp);
+#end;
+#drop procedure collect;
+#drop table temp;
+#drop table temp_aggregate;
+
+# 09:50:15 >
+# 09:50:15 > "Done."
+# 09:50:15 >
+
diff --git a/tools/merovingian/daemon/monetdbd.1.in
b/tools/merovingian/daemon/monetdbd.1.in
--- a/tools/merovingian/daemon/monetdbd.1.in
+++ b/tools/merovingian/daemon/monetdbd.1.in
@@ -108,7 +108,7 @@ calling environment, until given a stop
Sends a stop signal to the
.I monetdbd
process responsible for the given dbfarm.
-.IP
+.TP
\fBget\fP <\fBall\fP | \fIproperty\fP[,\fIproperty\fP[,..]]> \fIdbfarm\fP
Prints the requested properties, or all known properties, for the given
dbfarm. For each property, its value is printed. Some properties
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
