Changeset: 3d68d46f087a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3d68d46f087a
Modified Files:
monetdb5/mal/mal_scenario.c
Branch: default
Log Message:
Merge with Aug2011 branch.
diffs (161 lines):
diff --git a/monetdb5/mal/mal_scenario.c b/monetdb5/mal/mal_scenario.c
--- a/monetdb5/mal/mal_scenario.c
+++ b/monetdb5/mal/mal_scenario.c
@@ -321,13 +321,14 @@ updateScenario(str nme, str fnme, MALfcn
if (phase != -1) {
Client c1;
- for(c1 = mal_clients; c1 < mal_clients+MAL_MAXCLIENTS; c1++)
- if (c1->scenario &&
+ for (c1 = mal_clients; c1 < mal_clients + MAL_MAXCLIENTS; c1++)
{
+ if (c1->scenario &&
strcmp(c1->scenario, scen->name) == 0)
c1->phase[phase] = fcn;
if (c1->oldscenario &&
strcmp(c1->oldscenario, scen->name) == 0)
c1->oldphase[phase] = fcn;
+ }
}
}
diff --git a/sql/test/BugTracker-2011/Tests/All
b/sql/test/BugTracker-2011/Tests/All
--- a/sql/test/BugTracker-2011/Tests/All
+++ b/sql/test/BugTracker-2011/Tests/All
@@ -45,3 +45,4 @@ cast-crash.Bug-2678
div_zero_problem.Bug-2893
non-stable-select-bug.Bug-2894
HAVE_PERL?perl-short-read-bug.Bug-2897
+device-self-ref-fk
diff --git a/sql/test/BugTracker-2011/Tests/device-self-ref-fk.sql
b/sql/test/BugTracker-2011/Tests/device-self-ref-fk.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2011/Tests/device-self-ref-fk.sql
@@ -0,0 +1,13 @@
+START TRANSACTION;
+
+CREATE TABLE "device" (
+ "deviceid" int,
+ "parentdeviceid" int,
+ CONSTRAINT "device_pk" PRIMARY KEY ("deviceid")
+);
+COPY 2 RECORDS INTO "device" FROM stdin USING DELIMITERS ',','\n','"';
+2,NULL
+23,2
+ALTER TABLE "device" ADD CONSTRAINT "device_device_fk" FOREIGN KEY
("parentdeviceid") REFERENCES "device" ("deviceid");
+
+ROLLBACK;
diff --git a/sql/test/BugTracker-2011/Tests/device-self-ref-fk.stable.err
b/sql/test/BugTracker-2011/Tests/device-self-ref-fk.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2011/Tests/device-self-ref-fk.stable.err
@@ -0,0 +1,37 @@
+stderr of test 'device-self-ref-fk` in directory 'test/BugTracker-2011` itself:
+
+
+# 11:27:22 >
+# 11:27:22 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"gdk_dbfarm=/net/volund.ins.cwi.nl/export/scratch0/fabian/vtmp/mtest-Aug2011-volund.ins.cwi.nl/sql/dbfarm"
"--set" "mapi_open=true" "--set" "mapi_port=33057" "--set" "monet_prompt="
"--trace" "--forcemito" "--set" "mal_listing=2"
"--dbname=mTests_test_BugTracker-2011" "--set" "mal_listing=0"
+# 11:27:22 >
+
+# builtin opt gdk_dbname = demo
+# builtin opt gdk_dbfarm =
/ufs/fabian/scratch/monetdb/Aug2011/program-x86_64/var/lib/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 =
/net/volund.ins.cwi.nl/export/scratch0/fabian/vtmp/mtest-Aug2011-volund.ins.cwi.nl/sql/dbfarm
+# cmdline opt mapi_open = true
+# cmdline opt mapi_port = 33057
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbname = mTests_test_BugTracker-2011
+# cmdline opt mal_listing = 0
+
+# 11:27:22 >
+# 11:27:22 > "mclient" "-lsql" "-ftest" "-i" "-e" "--host=volund"
"--port=33057"
+# 11:27:22 >
+
+
+# 11:27:22 >
+# 11:27:22 > "Done."
+# 11:27:22 >
+
diff --git a/sql/test/BugTracker-2011/Tests/device-self-ref-fk.stable.out
b/sql/test/BugTracker-2011/Tests/device-self-ref-fk.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2011/Tests/device-self-ref-fk.stable.out
@@ -0,0 +1,68 @@
+stdout of test 'device-self-ref-fk` in directory 'test/BugTracker-2011` itself:
+
+
+# 11:27:22 >
+# 11:27:22 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"gdk_dbfarm=/net/volund.ins.cwi.nl/export/scratch0/fabian/vtmp/mtest-Aug2011-volund.ins.cwi.nl/sql/dbfarm"
"--set" "mapi_open=true" "--set" "mapi_port=33057" "--set" "monet_prompt="
"--trace" "--forcemito" "--set" "mal_listing=2"
"--dbname=mTests_test_BugTracker-2011" "--set" "mal_listing=0"
+# 11:27:22 >
+
+# MonetDB 5 server v11.5.4 "Aug2011-41b19066710b"
+# Serving database 'mTests_test_BugTracker-2011', using 4 threads
+# Compiled for x86_64-pc-linux-gnu/64bit with 64bit OIDs dynamically linked
+# Found 7.749 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://volund.ins.cwi.nl:33057/
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+# MonetDB/DataCell module not loaded
+# SQLException:mvc:SQL module not initialized
+
+Ready.
+# SQL catalog created, loading sql scripts once
+# loading sql script: 10_math.sql
+# loading sql script: 11_times.sql
+# loading sql script: 12_url.sql
+# loading sql script: 13_date.sql
+# loading sql script: 14_inet.sql
+# loading sql script: 15_history.sql
+# loading sql script: 16_tracelog.sql
+# loading sql script: 17_compress.sql
+# loading sql script: 18_dictionary.sql
+# loading sql script: 19_cluster.sql
+# loading sql script: 20_vacuum.sql
+# loading sql script: 21_dependency_functions.sql
+# loading sql script: 22_clients.sql
+# loading sql script: 23_skyserver.sql
+# loading sql script: 24_zorder.sql
+# loading sql script: 25_debug.sql
+# loading sql script: 40_geom.sql
+# loading sql script: 50_datacell.sql
+# loading sql script: 80_udf.sql
+# loading sql script: 99_system.sql
+
+# 11:27:22 >
+# 11:27:22 > "mclient" "-lsql" "-ftest" "-i" "-e" "--host=volund"
"--port=33057"
+# 11:27:22 >
+
+#START TRANSACTION;
+#CREATE TABLE "device" (
+# "deviceid" int,
+# "parentdeviceid" int,
+# CONSTRAINT "device_pk" PRIMARY KEY ("deviceid")
+#);
+#COPY 2 RECORDS INTO "device" FROM stdin USING DELIMITERS ',','\n','"';
+#2,NULL
+#23,2
+#ALTER TABLE "device" ADD CONSTRAINT "device_device_fk" FOREIGN KEY
("parentdeviceid") REFERENCES "device" ("deviceid");
+[ 2 ]
+#COPY 2 RECORDS INTO "device" FROM stdin USING DELIMITERS ',','\n','"';
+#2,NULL
+#23,2
+#ALTER TABLE "device" ADD CONSTRAINT "device_device_fk" FOREIGN KEY
("parentdeviceid") REFERENCES "device" ("deviceid");
+#ROLLBACK;
+
+# 11:27:22 >
+# 11:27:22 > "Done."
+# 11:27:22 >
+
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
