Changeset: 81eb00c2f449 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=81eb00c2f449
Modified Files:
clients/mapiclient/dump.c
sql/test/Tests/mclient-t-s.SQL.py
sql/test/Tests/mclient-t-s.stable.err
sql/test/Tests/mclient-t-s.stable.err.Darwin
sql/test/Tests/mclient-t-s.stable.err.SunOS
sql/test/Tests/mclient-t-s.stable.err.Windows
sql/test/Tests/mclient-t-s.stable.out
testing/Mtest.py.in
Branch: default
Log Message:
Merge with Aug2011 branch.
diffs (truncated from 1262 to 300 lines):
diff --git a/clients/mapiclient/dump.c b/clients/mapiclient/dump.c
--- a/clients/mapiclient/dump.c
+++ b/clients/mapiclient/dump.c
@@ -1900,17 +1900,19 @@ void
dump_version(Mapi mid, stream *toConsole, const char *prefix)
{
MapiHdl hdl;
- char *dbname = NULL, *uri = NULL, m5ver[24];
+ char *dbname = NULL, *uri = NULL, *dbver = NULL, *dbrel = NULL;
char *name, *val;
if ((hdl = mapi_query(mid,
"SELECT \"name\", \"value\" "
"FROM sys.env() AS env "
- "WHERE \"name\" IN ('gdk_dbname',
'monet_version', 'merovingian_uri')")) == NULL ||
- mapi_error(mid))
+ "WHERE \"name\" IN ('gdk_dbname', "
+ "'monet_version', "
+ "'monet_release', "
+ "'merovingian_uri')")) == NULL ||
+ mapi_error(mid))
goto cleanup;
- m5ver[0] = '\0';
while ((mapi_fetch_row(hdl)) != 0) {
name = mapi_fetch_field(hdl, 0);
val = mapi_fetch_field(hdl, 1);
@@ -1920,9 +1922,11 @@ dump_version(Mapi mid, stream *toConsole
if (name != NULL && val != NULL) {
if (strcmp(name, "gdk_dbname") == 0)
- dbname = strdup(val);
+ dbname = *val == '\0' ? NULL : strdup(val);
else if (strcmp(name, "monet_version") == 0)
- snprintf(m5ver, sizeof(m5ver), "%s", val);
+ dbver = *val == '\0' ? NULL : strdup(val);
+ else if (strcmp(name, "monet_release") == 0)
+ dbrel = *val == '\0' ? NULL : strdup(val);
else if (strcmp(name, "merovingian_uri") == 0)
uri = strdup(val);
}
@@ -1932,13 +1936,23 @@ dump_version(Mapi mid, stream *toConsole
free(dbname);
dbname = uri;
}
- if (dbname != NULL && *dbname != '\0' && m5ver[0] != '\0')
- mnstr_printf(toConsole, "%s MonetDB v%s, '%s'\n",
- prefix, m5ver, dbname);
+ if (dbname != NULL && dbver != NULL) {
+ mnstr_printf(toConsole, "%s MonetDB v%s%s%s%s, '%s'\n",
+ prefix,
+ dbver,
+ dbrel != NULL ? " (" : "",
+ dbrel != NULL ? dbrel : "",
+ dbrel != NULL ? ")" : "",
+ dbname);
+ }
cleanup:
if (dbname != NULL)
free(dbname);
+ if (dbver != NULL)
+ free(dbver);
+ if (dbrel != NULL)
+ free(dbrel);
if (hdl)
mapi_close_handle(hdl);
}
diff --git a/sql/test/ADT2006/Tests/bram.stable.out
b/sql/test/ADT2006/Tests/bram.stable.out
--- a/sql/test/ADT2006/Tests/bram.stable.out
+++ b/sql/test/ADT2006/Tests/bram.stable.out
@@ -1,145 +1,378 @@
stdout of test 'bram` in directory 'test/ADT2006` itself:
-# 11:56:15 >
-# 11:56:15 > mserver5
"--config=/ufs/goncalve/scratch/MonetDB/stable/debug/MonetDB5/etc/monetdb5.conf"
--debug=10 --set
"monet_mod_path=/ufs/goncalve/scratch/MonetDB/stable/debug/MonetDB5//lib/MonetDB5:/ufs/goncalve/scratch/MonetDB/stable/debug/MonetDB5//lib/MonetDB5/lib:/ufs/goncalve/scratch/MonetDB/stable/debug/MonetDB5//lib/MonetDB5/bin"
--set
"gdk_dbfarm=/ufs/goncalve/scratch/MonetDB/stable/debug/MonetDB5//var/MonetDB5/dbfarm"
--set
"sql_logdir=/ufs/goncalve/scratch/MonetDB/stable/debug/MonetDB5//var/MonetDB5/sql_logs"
--set mapi_open=true --set xrpc_open=true --set mapi_port=30364 --set
xrpc_port=49769 --set monet_prompt= --trace "--dbname=mTests_src_test_ADT2006"
--set mal_listing=0 "--dbinit= include sql;" ; echo ; echo Over..
-# 11:56:15 >
+# 14:44:20 >
+# 14:44:20 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"gdk_dbfarm=/ufs/sjoerd/Monet-candidate/var/MonetDB" "--set" "mapi_open=true"
"--set" "mapi_port=33320" "--set" "monet_prompt=" "--trace" "--forcemito"
"--set" "mal_listing=2" "--dbname=mTests_test_ADT2006" "--set" "mal_listing=0"
+# 14:44:20 >
-# MonetDB server v5.6.1, based on kernel v1.24.1
-# Serving database 'mTests_src_test_ADT2006'
+# MonetDB 5 server v11.5.4
+# This is an unreleased version
+# Serving database 'mTests_test_ADT2006', using 4 threads
# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
-# Copyright (c) 1993-2008 CWI, all rights reserved
-# Visit http://monetdb.cwi.nl/ for further information
-# Listening for connection requests on mapi:monetdb://alviss.ins.cwi.nl:30364/
-# MonetDB/SQL module v2.24.1 loaded
+# 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://ottar.ins.cwi.nl:33320/
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
Ready.
-#function user.main():void;
-# clients.quit();
-#end main;
+# 14:44:21 >
+# 14:44:21 > "mclient" "-lsql" "-ftest" "-i" "-e" "--host=ottar"
"--port=33320"
+# 14:44:21 >
-# 16:54:49 >
-# 16:54:49 > Mtimeout -timeout 60 MapiClient -lsql -umonetdb -Pmonetdb
--host=localhost --port=37395 < bram.sql
-# 16:54:49 >
-
+#CREATE TABLE victim (
+#name VARCHAR(50) PRIMARY KEY NOT NULL,
+#date_of_birth VARCHAR(10),
+#length CHAR(8),
+#eyes CHAR(20),
+#hair VARCHAR(30),
+#date DATE,
+#location VARCHAR(250),
+#picture VARCHAR(150),
+#features TEXT,
+#survived BOOLEAN DEFAULT FALSE
+#);
+#CREATE TABLE suspect (
+#name VARCHAR(50) PRIMARY KEY NOT NULL,
+#picture VARCHAR(150),
+#notes TEXT
+#);
+#CREATE TABLE inspector (
+#name VARCHAR(50) PRIMARY KEY NOT NULL,
+#picture VARCHAR(150)
+#);
+#CREATE TABLE witness (
+#name VARCHAR(50),
+#victim VARCHAR(50),
+#time VARCHAR(50),
+#appearence TEXT,
+#diction TEXT,
+#CONSTRAINT "witness_pkey" PRIMARY KEY (name, victim),
+#CONSTRAINT "witness_victim_fkey" FOREIGN KEY (victim) REFERENCES victim
(name) ON UPDATE CASCADE ON DELETE CASCADE
+#);
+#CREATE TABLE doctor (
+#name VARCHAR(50) NOT NULL,
+#victim VARCHAR(50) NOT NULL,
+#CONSTRAINT "doctor_pkey" PRIMARY KEY (name, victim),
+#CONSTRAINT "doctor_victim_fkey" FOREIGN KEY (victim) REFERENCES victim (name)
ON UPDATE CASCADE ON DELETE CASCADE
+#);
+#CREATE TABLE event (
+#id INTEGER AUTO_INCREMENT,
+#victim VARCHAR(50) NOT NULL,
+#time VARCHAR(50),
+#description TEXT,
+#CONSTRAINT "event_pkey" PRIMARY KEY (id, victim),
+#CONSTRAINT "event_victim_fkey" FOREIGN KEY (victim) REFERENCES victim (name)
ON UPDATE CASCADE ON DELETE CASCADE
+#);
+#CREATE TABLE suspect_victim (
+#suspect VARCHAR(50) NOT NULL,
+#victim VARCHAR(50) NOT NULL,
+#CONSTRAINT "suspect_victim_pkey" PRIMARY KEY (suspect, victim),
+#CONSTRAINT "suspect_victim_victim_fkey" FOREIGN KEY (victim) REFERENCES
victim (name) ON UPDATE CASCADE ON DELETE CASCADE,
+#CONSTRAINT "suspect_suspect_victim_fkey" FOREIGN KEY (suspect) REFERENCES
suspect (name) ON UPDATE CASCADE ON DELETE CASCADE
+#);
+#CREATE TABLE inspector_victim (
+#inspector VARCHAR(50) NOT NULL,
+#victim VARCHAR(50) NOT NULL,
+#CONSTRAINT "inspector_victim_pkey" PRIMARY KEY (inspector, victim),
+#CONSTRAINT "inspector_victim_victim_fkey" FOREIGN KEY (victim) REFERENCES
victim (name) ON UPDATE CASCADE ON DELETE CASCADE,
+#CONSTRAINT "inspector_victim_inspector_fkey" FOREIGN KEY (inspector)
REFERENCES inspector (name) ON UPDATE CASCADE ON DELETE CASCADE
+#);
+#INSERT INTO inspector VALUES ('Inspector Frederick Abberline',
'http://www.casebook.org/images/police_abb1.jpg');
[ 1 ]
+#INSERT INTO inspector VALUES ('Sir Robert Anderson',
'http://www.casebook.org/images/police_and.jpg');
[ 1 ]
+#INSERT INTO inspector VALUES ('Inspector Walter Andrews',
'http://www.casebook.org/images/police_walter_andrews.jpg');
[ 1 ]
+#INSERT INTO inspector VALUES ('Superintendent Thomas Arnold',
'http://www.casebook.org/images/police_thomas_arnold.jpg');
[ 1 ]
+#INSERT INTO inspector VALUES ('Detective Constable Walter Dew',
'http://www.casebook.org/images/police_dew.jpg');
[ 1 ]
+#INSERT INTO inspector VALUES ('Detective Sergeant George Godley',
'http://www.casebook.org/images/police_god.jpg');
[ 1 ]
+#INSERT INTO inspector VALUES ('P.C. James Harvey',
'http://www.casebook.org/images/police_sag.jpg');
[ 1 ]
+#INSERT INTO inspector VALUES ('Inspector Joseph Henry Helson',
'http://www.casebook.org/images/police_helson.jpg');
[ 1 ]
+#INSERT INTO inspector VALUES ('Chief Inspector John George',
'http://www.casebook.org/images/police_lc.jpg');
[ 1 ]
+#INSERT INTO inspector VALUES ('Sir Melville Macnaghten',
'http://www.casebook.org/images/police_mac.jpg');
[ 1 ]
+#INSERT INTO inspector VALUES ('James Monro',
'http://www.casebook.org/images/police_mon.jpg');
[ 1 ]
+#INSERT INTO inspector VALUES ('Chief Inspector Henry Moore',
'http://www.casebook.org/images/police_henry_moore.jpg');
[ 1 ]
+#INSERT INTO inspector VALUES ('P.C. John Neil',
'http://www.casebook.org/images/police_john_neil.jpg');
[ 1 ]
+#INSERT INTO inspector VALUES ('Inspector Edmund Reid',
'http://www.casebook.org/images/police_edmund_reid.jpg');
[ 1 ]
+#INSERT INTO inspector VALUES ('Detective Constable Robert Sagar',
'http://www.casebook.org/images/police_sag.jpg');
[ 1 ]
+#INSERT INTO inspector VALUES ('Major Henry Smith',
'http://www.casebook.org/images/police_smi.jpg');
[ 1 ]
+#INSERT INTO inspector VALUES ('P.C. William Smith',
'http://www.casebook.org/images/police_william_smith.jpg');
[ 1 ]
+#INSERT INTO inspector VALUES ('Inspector John Spratling',
'http://www.casebook.org/images/police_sag.jpg');
[ 1 ]
+#INSERT INTO inspector VALUES ('Chief Inspector Donald Swanson',
'http://www.casebook.org/images/police_sut.jpg');
[ 1 ]
+#INSERT INTO inspector VALUES ('Sergeant William Thick',
'http://www.casebook.org/images/police_thi.jpg');
[ 1 ]
+#INSERT INTO inspector VALUES ('P.C. Ernest Thompson',
'http://www.casebook.org/images/police_ernest_thompson.jpg');
[ 1 ]
+#INSERT INTO inspector VALUES ('Sir Charles Warren',
'http://www.casebook.org/images/police_war.jpg');
[ 1 ]
+#INSERT INTO inspector VALUES ('P.C. Edward Watkins',
'http://www.casebook.org/images/police_edward_watkins.jpg');
[ 1 ]
+#INSERT INTO inspector VALUES ('Sergeant Stephen White',
'http://www.casebook.org/images/police_steven_white.jpg');
[ 1 ]
+#INSERT INTO inspector VALUES ('Chief Constable Adolphus Frederick
Williamson', 'http://www.casebook.org/images/police_frederick_williamson.jpg');
[ 1 ]
+#INSERT INTO inspector VALUES ('P.C. Neil',
'http://www.casebook.org/images/neil.jpg');
[ 1 ]
+#INSERT INTO suspect VALUES ('Prince Albert Victor',
'http://www.casebook.org/images/ed1890b.jpg', 'one of the most famous
suspects');
[ 1 ]
+#INSERT INTO suspect VALUES ('Joseph Barnett',
'http://www.casebook.org/images/barnett2.jpg', 'was not described as a Ripper
suspect until the 1970s');
[ 1 ]
+#INSERT INTO suspect VALUES ('Alfred Napier Blanchard',
'http://www.casebook.org/images/suspect_lodge.jpg', 'made a false confession');
[ 1 ]
+#INSERT INTO suspect VALUES ('William Henry Bury',
'http://www.casebook.org/images/whbury.jpg', 'Police at the time investigated
the matter but did not seem to consider Bury a viable suspect');
[ 1 ]
+#INSERT INTO suspect VALUES ('Lewis Carroll',
'http://www.casebook.org/images/suspect_carroll.jpg', 'a very unlikely
suspect');
[ 1 ]
+#INSERT INTO suspect VALUES ('David Cohen',
'http://www.casebook.org/images/suspect_lodge.jpg', 'a poor Polish Jew, living
in Whitechapel and who had "homocidal tendensies and a great hatred of women",
and was confined to a lunatic asylum at the right time for the murders to stop
and died shortly afterwards');
[ 1 ]
+#INSERT INTO suspect VALUES ('Dr. Thomas Neill Cream',
'http://www.casebook.org/suspects/cream.html', 'did commit murders, but by
poisoning');
[ 1 ]
+#INSERT INTO suspect VALUES ('Frederick Bailey Deeming',
'http://www.casebook.org/images/suspect_deem.jpg', 'The only two links he may
have had with the Whitechapel murders were (1) his insanity and (2) his method
of killing his family');
[ 1 ]
+#INSERT INTO suspect VALUES ('Montague John Druitt',
'http://www.casebook.org/images/suspect_druitt.jpg', 'He is considered by many
to be the number one suspect in the case, yet there is little evidence');
[ 1 ]
+#INSERT INTO suspect VALUES ('Fogelma',
'http://www.casebook.org/images/suspect_lodge.jpg', 'no outside evidence to
corroborate the story told by the Empire News');
[ 1 ]
+#INSERT INTO suspect VALUES ('George Hutchinson (Br.)',
'http://www.casebook.org/images/suspect_lodge.jpg', 'Police at the time
interviewed him but did not seem to consider him a suspect');
[ 1 ]
+#INSERT INTO suspect VALUES ('Mrs. Mary Pearcey',
'http://www.casebook.org/images/suspect_jill.jpg', 'Not very likely "Jill the
Ripper"-theory, first published in 1939');
[ 1 ]
+#INSERT INTO suspect VALUES ('James Kelly',
'http://www.casebook.org/images/suspect_jkell.jpg', 'there are some reasons in
favour of and some against suspecting him');
[ 1 ]
+#INSERT INTO suspect VALUES ('Severin Klosowski (George Chapman)',
'http://www.casebook.org/images/suspect_klos.jpg', 'there are some reasons in
favour of and some against suspecting him');
[ 1 ]
+#INSERT INTO suspect VALUES ('Aaron Kosminski',
'http://www.casebook.org/images/suspect_kosm.jpg', 'According to Anderson and
Swanson, identified by a witness as the Ripper, but no charges were brought
against him due to the witness\'s reluctance to testify against "a fellow Jew."
Known to have been insane.');
[ 1 ]
+#INSERT INTO suspect VALUES ('Jacob Levy',
'http://www.casebook.org/images/suspect_lodge.jpg', 'a butcher, and the cuts
inflicted upon Catharine Eddowes were suggestive of a butcher');
[ 1 ]
+#INSERT INTO suspect VALUES ('The Lodger (Frances Tumblety)',
'http://www.casebook.org/images/suspect_lodge.jpg', 'a very strong suspect');
[ 1 ]
+#INSERT INTO suspect VALUES ('James Maybrick',
'http://www.casebook.org/images/suspect_may.jpg', 'The mysterious emergence of
the so-called Maybrick journal in 1992 however, immediately thrust him to the
forefront of credible Ripper suspects.');
[ 1 ]
+#INSERT INTO suspect VALUES ('Michael Ostrog',
'http://www.casebook.org/images/suspect_ost.jpg', 'Mentioned for the first time
as a suspect in 1894,in 1994 a lot of information was published making him a
prime suspect');
[ 1 ]
+#INSERT INTO suspect VALUES ('Dr. Alexander Pedachenko',
'http://www.casebook.org/images/suspect_lodge.jpg', 'may never have existed');
[ 1 ]
+#INSERT INTO suspect VALUES ('The Royal Conspiracy',
'http://www.casebook.org/images/suspec\'_royal.jpg', 'a fascinating tapestry of
conspiracy involving virtually every person who has ever been a Ripper suspect
plus a few new ones');
[ 1 ]
+#INSERT INTO suspect VALUES ('Walter Sickert',
'http://www.casebook.org/images/suspect_sickert.jpg', 'a valid suspect since
the 1990s');
[ 1 ]
+#INSERT INTO suspect VALUES ('James Kenneth Stephen',
'http://www.casebook.org/images/suspect_jkstep.jpg', 'Known misogynist and
lunatic but no connections with the East End');
[ 1 ]
+#INSERT INTO suspect VALUES ('R. D´Onston Stephenson',
'http://www.casebook.org/images/suspect_dons.jpg', 'Known to have had an
extraordinary interest in the murders. Wrote numerous articles and letters on
the matter. Resided in the East End.');
[ 1 ]
+#INSERT INTO suspect VALUES ('Alois Szemeredy',
'http://www.casebook.org/images/suspect_szemeredy.jpg', 'from Buenos Aires,
suspected of the Jack the Ripper- and other murders');
[ 1 ]
+#INSERT INTO suspect VALUES ('Francis Thompson',
'http://www.casebook.org/images/suspect_thompson.jpg', 'At 29, Thompson was the
right age to fit the Ripper descriptions, and we know he had some medical
training. He was also said to carry a dissecting scalpel around with him, which
he claimed he used to shave');
[ 1 ]
+#INSERT INTO suspect VALUES ('Frances Tumblety',
'http://www.casebook.org/images/suspect_tumb.jpg', 'There is a strong case to
be made that he was indeed the Batty Street Lodger');
[ 1 ]
+#INSERT INTO suspect VALUES ('Nikolay Vasiliev',
'http://www.casebook.org/images/suspect_lodge.jpg', 'an elusive legend, which
probably had some basis in reality, but was mostly embellished by the
journalists who wrote it up');
[ 1 ]
+#INSERT INTO suspect VALUES ('Dr. John Williams',
'http://www.casebook.org/images/dr-john-williams.jpg', 'there is very little to
suggest that he was Jack the Ripper');
[ 1 ]
+#INSERT INTO victim VALUES ('Mary Ann Walker', NULL, '5\'12"', 'brown', 'brown
hair turning grey', '1888-08-31', 'Buck\'s Row by Charles Cross',
'http://www.casebook.org/images/victims_nichols.jpg', '
+# five front teeth missing (Rumbelow); two
bottom-one top
+# front (Fido), her teeth are slightly
discoloured. She is
+# described as having small, delicate features
with high
+# cheekbones and grey eyes. She has a small scar
on her
+# forehead from a childhood injury. She is
described by
+# Emily Holla
[ 1 ]
+#INSERT INTO victim VALUES ('Annie Chapman', NULL, '5\'', 'blue', 'dark brown,
wavy', '1888-09-08', '29 Hanbury Street',
'http://www.casebook.org/images/victims_chapman.jpg', 'Pallid complexion,
excellent teeth (possibly two missing in lower jaw), strongly built (stout),
thick nose', NULL);
[ 1 ]
+#INSERT INTO victim VALUES ('Elisabeth Stride', NULL, '5\'5"', 'light gray',
'curly dark brown', '1888-09-30', 'Berner Street (Henriques Street today)',
'http://www.casebook.org/images/victims_stride.jpg', 'pale complexion, all the
teeth in her lower left jaw were missing
+# ', NULL);
[ 1 ]
+#INSERT INTO victim VALUES ('Catherine Eddowes', NULL, '5\'', 'hazel', 'dark
auburn', '1888-09-30', 'Mitre Square',
'http://www.casebook.org/images/eddowes1.jpg', 'She has a tattoo in blue ink on
her left forearm "TC."', NULL);
[ 1 ]
+#INSERT INTO victim VALUES ('Mary Jane Kelly', NULL, '5\'7"', 'blue',
'blonde', '1888-11-09', '13 Miller\'s Court',
'http://www.casebook.org/images/victims_kelly.jpg', 'a fair complexion. "Said
to have been possessed of considerable personal attractions." (McNaughten) She
was last seen wearing a linsey frock and a red shawl pulled around her
shoulders. She was bare headed. Detective Constable Walter Dew claimed to know
Kelly well by sight and says that she was attractive and paraded around,
usually in the co
[ 1 ]
+#INSERT INTO victim VALUES ('"Fairy Fay"', NULL, 'unknown', 'unknown',
'unknown', '1887-12-26', 'the alleys of Commercial Road',
'http://www.casebook.org/images/victims_fairy.jpg', 'not recorded
+# ', NULL);
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
