Changeset: c2b815952538 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c2b815952538
Modified Files:
sql/benchmarks/wisconsin/Tests/load.timeout
sql/test/BugTracker-2010/Tests/huge_nr_of_columns.Bug-2609.timeout
sql/test/BugTracker-2010/Tests/slow-query.Bug-2671.timeout
sql/test/BugTracker/Tests/connect_crash.SF-1436626.timeout
sql/test/BugTracker/Tests/mdb_starts_with_sql_debug_64.SF-1999354.timeout
sql/test/BugTracker/Tests/set_a_new_user_password.SF-1844050.timeout
sql/test/BugTracker/Tests/set_sql_debug_64__breaking_the_DB.SF-1906287.timeout
Branch: default
Log Message:
Merge with Dec2011 branch.
diffs (266 lines):
diff --git a/clients/ChangeLog.Aug2011 b/clients/ChangeLog.Aug2011
--- a/clients/ChangeLog.Aug2011
+++ b/clients/ChangeLog.Aug2011
@@ -1,3 +1,6 @@
# ChangeLog file for clients
# This file is updated with Maddlog
+* Thu Oct 20 2011 Sjoerd Mullender <sjo...@acm.org>
+- ODBC: Implemented a workaround in SQLTables for bug 2908.
+
diff --git a/sql/benchmarks/tpch/Tests/check1.timeout
b/sql/benchmarks/tpch/Tests/check1.timeout
new file mode 100644
--- /dev/null
+++ b/sql/benchmarks/tpch/Tests/check1.timeout
@@ -0,0 +1,1 @@
+16.8
diff --git a/sql/benchmarks/wisconsin/Tests/load.timeout
b/sql/benchmarks/wisconsin/Tests/load.timeout
deleted file mode 100644
--- a/sql/benchmarks/wisconsin/Tests/load.timeout
+++ /dev/null
@@ -1,1 +0,0 @@
-4
diff --git
a/sql/test/BugDay_2005-10-06_2.9.3/Tests/huge_expression_and_column_name.SF-921173.timeout
b/sql/test/BugDay_2005-10-06_2.9.3/Tests/huge_expression_and_column_name.SF-921173.timeout
new file mode 100644
--- /dev/null
+++
b/sql/test/BugDay_2005-10-06_2.9.3/Tests/huge_expression_and_column_name.SF-921173.timeout
@@ -0,0 +1,1 @@
+16.8
diff --git
a/sql/test/BugTracker-2009/Tests/updating_non-loaded_columns.SF-2864313_KO-3.timeout
b/sql/test/BugTracker-2009/Tests/updating_non-loaded_columns.SF-2864313_KO-3.timeout
new file mode 100644
--- /dev/null
+++
b/sql/test/BugTracker-2009/Tests/updating_non-loaded_columns.SF-2864313_KO-3.timeout
@@ -0,0 +1,1 @@
+16.8
diff --git a/sql/test/BugTracker-2010/Tests/huge_nr_of_columns.Bug-2609.timeout
b/sql/test/BugTracker-2010/Tests/huge_nr_of_columns.Bug-2609.timeout
deleted file mode 100644
--- a/sql/test/BugTracker-2010/Tests/huge_nr_of_columns.Bug-2609.timeout
+++ /dev/null
@@ -1,1 +0,0 @@
-20
diff --git a/sql/test/BugTracker-2010/Tests/slow-query.Bug-2671.timeout
b/sql/test/BugTracker-2010/Tests/slow-query.Bug-2671.timeout
deleted file mode 100644
--- a/sql/test/BugTracker-2010/Tests/slow-query.Bug-2671.timeout
+++ /dev/null
@@ -1,1 +0,0 @@
-0.1
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
@@ -48,5 +48,6 @@ HAVE_PERL?perl-short-read-bug.Bug-2897
device-self-ref-fk
missing_refine_reverse.Bug-2898
rand-with-seed.Bug-2900
+python-connections-Bug.2901
many-connects-cache.Bug-2904
alter-table-set-read-only.bug-2906
diff --git a/sql/test/BugTracker-2011/Tests/python-connections-Bug.2901.SQL.py
b/sql/test/BugTracker-2011/Tests/python-connections-Bug.2901.SQL.py
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2011/Tests/python-connections-Bug.2901.SQL.py
@@ -0,0 +1,42 @@
+import monetdb.sql
+import os
+
+c = monetdb.sql.Connection(port = int(os.getenv('MAPIPORT')),
+ database = os.getenv('TSTDB'))
+c.close()
+
+c = monetdb.sql.Connection(port = int(os.getenv('MAPIPORT')),
+ database = os.getenv('TSTDB'),
+ user = 'monetdb')
+c.close()
+
+c = monetdb.sql.Connection(port = int(os.getenv('MAPIPORT')),
+ database = os.getenv('TSTDB'),
+ user = 'monetdb',
+ username = 'bogus_user_name')
+c.close()
+
+c = monetdb.sql.Connection(port = int(os.getenv('MAPIPORT')),
+ database = os.getenv('TSTDB'),
+ username = 'monetdb')
+c.close()
+
+c = monetdb.sql.Connection(port = int(os.getenv('MAPIPORT')),
+ database = os.getenv('TSTDB'))
+c.close()
+
+c = monetdb.sql.Connection(port = int(os.getenv('MAPIPORT')),
+ database = os.getenv('TSTDB'),
+ host = os.getenv('HOST'))
+c.close()
+
+c = monetdb.sql.Connection(port = int(os.getenv('MAPIPORT')),
+ database = os.getenv('TSTDB'),
+ host = os.getenv('HOST'),
+ hostname = 'bogus_host_name')
+c.close()
+
+c = monetdb.sql.Connection(port = int(os.getenv('MAPIPORT')),
+ database = os.getenv('TSTDB'),
+ hostname = os.getenv('HOST'))
+c.close()
diff --git
a/sql/test/BugTracker-2011/Tests/python-connections-Bug.2901.stable.err
b/sql/test/BugTracker-2011/Tests/python-connections-Bug.2901.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2011/Tests/python-connections-Bug.2901.stable.err
@@ -0,0 +1,37 @@
+stderr of test 'python-connections-Bug.2901` in directory
'test/BugTracker-2011` itself:
+
+
+# 17:16:09 >
+# 17:16:09 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"gdk_dbfarm=/ufs/sjoerd/Monet-stable/var/MonetDB" "--set" "mapi_open=true"
"--set" "mapi_port=36960" "--set" "monet_prompt=" "--trace" "--forcemito"
"--set" "mal_listing=2" "--dbname=mTests_test_BugTracker-2011" "--set"
"mal_listing=0"
+# 17:16:09 >
+
+# builtin opt gdk_dbname = demo
+# builtin opt gdk_dbfarm = /ufs/sjoerd/Monet-stable/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-stable/var/MonetDB
+# cmdline opt mapi_open = true
+# cmdline opt mapi_port = 36960
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbname = mTests_test_BugTracker-2011
+# cmdline opt mal_listing = 0
+
+# 17:16:09 >
+# 17:16:09 > "/usr/bin/python" "python-connections-Bug.2901.SQL.py"
"python-connections-Bug.2901"
+# 17:16:09 >
+
+
+# 17:16:10 >
+# 17:16:10 > "Done."
+# 17:16:10 >
+
diff --git
a/sql/test/BugTracker-2011/Tests/python-connections-Bug.2901.stable.out
b/sql/test/BugTracker-2011/Tests/python-connections-Bug.2901.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2011/Tests/python-connections-Bug.2901.stable.out
@@ -0,0 +1,50 @@
+stdout of test 'python-connections-Bug.2901` in directory
'test/BugTracker-2011` itself:
+
+
+# 17:16:09 >
+# 17:16:09 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"gdk_dbfarm=/ufs/sjoerd/Monet-stable/var/MonetDB" "--set" "mapi_open=true"
"--set" "mapi_port=36960" "--set" "monet_prompt=" "--trace" "--forcemito"
"--set" "mal_listing=2" "--dbname=mTests_test_BugTracker-2011" "--set"
"mal_listing=0"
+# 17:16:09 >
+
+# MonetDB 5 server v11.5.6
+# This is an unreleased version
+# Serving database 'mTests_test_BugTracker-2011', using 4 threads
+# Compiled for x86_64-unknown-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://ottar.ins.cwi.nl:36960/
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+
+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: 80_udf.sql
+# loading sql script: 99_system.sql
+
+# 17:16:09 >
+# 17:16:09 > "/usr/bin/python" "python-connections-Bug.2901.SQL.py"
"python-connections-Bug.2901"
+# 17:16:09 >
+
+
+# 17:16:10 >
+# 17:16:10 > "Done."
+# 17:16:10 >
+
diff --git a/sql/test/BugTracker/Tests/connect_crash.SF-1436626.timeout
b/sql/test/BugTracker/Tests/connect_crash.SF-1436626.timeout
deleted file mode 100644
--- a/sql/test/BugTracker/Tests/connect_crash.SF-1436626.timeout
+++ /dev/null
@@ -1,1 +0,0 @@
-0.4
diff --git
a/sql/test/BugTracker/Tests/mdb_starts_with_sql_debug_64.SF-1999354.timeout
b/sql/test/BugTracker/Tests/mdb_starts_with_sql_debug_64.SF-1999354.timeout
deleted file mode 100644
--- a/sql/test/BugTracker/Tests/mdb_starts_with_sql_debug_64.SF-1999354.timeout
+++ /dev/null
@@ -1,1 +0,0 @@
-0.3
diff --git
a/sql/test/BugTracker/Tests/set_a_new_user_password.SF-1844050.timeout
b/sql/test/BugTracker/Tests/set_a_new_user_password.SF-1844050.timeout
deleted file mode 100644
--- a/sql/test/BugTracker/Tests/set_a_new_user_password.SF-1844050.timeout
+++ /dev/null
@@ -1,1 +0,0 @@
-0.5
diff --git
a/sql/test/BugTracker/Tests/set_sql_debug_64__breaking_the_DB.SF-1906287.timeout
b/sql/test/BugTracker/Tests/set_sql_debug_64__breaking_the_DB.SF-1906287.timeout
deleted file mode 100644
---
a/sql/test/BugTracker/Tests/set_sql_debug_64__breaking_the_DB.SF-1906287.timeout
+++ /dev/null
@@ -1,1 +0,0 @@
-0.4
diff --git a/sql/test/Skyserver/Tests/Skyserver.timeout
b/sql/test/Skyserver/Tests/Skyserver.timeout
--- a/sql/test/Skyserver/Tests/Skyserver.timeout
+++ b/sql/test/Skyserver/Tests/Skyserver.timeout
@@ -1,1 +1,1 @@
-16.8
+11
diff --git a/sql/test/VOC/Tests/VOC.timeout b/sql/test/VOC/Tests/VOC.timeout
--- a/sql/test/VOC/Tests/VOC.timeout
+++ b/sql/test/VOC/Tests/VOC.timeout
@@ -1,1 +1,1 @@
-2
+16.8
diff --git a/sql/test/rdf/Tests/q2_v.sql.timeout
b/sql/test/rdf/Tests/q2_v.sql.timeout
new file mode 100644
--- /dev/null
+++ b/sql/test/rdf/Tests/q2_v.sql.timeout
@@ -0,0 +1,1 @@
+16.8
diff --git a/sql/test/rdf/Tests/q3_v.sql.timeout
b/sql/test/rdf/Tests/q3_v.sql.timeout
new file mode 100644
--- /dev/null
+++ b/sql/test/rdf/Tests/q3_v.sql.timeout
@@ -0,0 +1,1 @@
+16.8
diff --git a/sql/test/rdf/Tests/q4_v.sql.timeout
b/sql/test/rdf/Tests/q4_v.sql.timeout
new file mode 100644
--- /dev/null
+++ b/sql/test/rdf/Tests/q4_v.sql.timeout
@@ -0,0 +1,1 @@
+16.8
diff --git a/sql/test/rdf/Tests/q6_v.sql.timeout
b/sql/test/rdf/Tests/q6_v.sql.timeout
new file mode 100644
--- /dev/null
+++ b/sql/test/rdf/Tests/q6_v.sql.timeout
@@ -0,0 +1,1 @@
+16.8
diff --git a/sql/test/rdf/Tests/q8_v.sql.timeout
b/sql/test/rdf/Tests/q8_v.sql.timeout
new file mode 100644
--- /dev/null
+++ b/sql/test/rdf/Tests/q8_v.sql.timeout
@@ -0,0 +1,1 @@
+16.8
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
