Changeset: ec461630b5a7 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ec461630b5a7
Modified Files:
common/utils/mutils.c
Branch: default
Log Message:
Merge with Apr2011 branch.
diffs (truncated from 516 to 300 lines):
diff --git a/common/utils/mutils.c b/common/utils/mutils.c
--- a/common/utils/mutils.c
+++ b/common/utils/mutils.c
@@ -343,6 +343,7 @@
const char *execn = getexecname();
/* copy, such that the caller can actually modify this string */
snprintf(_bin_path, sizeof(_bin_path), "%s", execn);
+ return _bin_path;
#else /* try Linux approach */
if (readlink("/proc/self/exe",
_bin_path, sizeof(_bin_path)) != -1)
diff --git a/sql/jdbc/tests/Tests/Test_PSlargeamount.timeout
b/sql/jdbc/tests/Tests/Test_PSlargeamount.timeout
--- a/sql/jdbc/tests/Tests/Test_PSlargeamount.timeout
+++ b/sql/jdbc/tests/Tests/Test_PSlargeamount.timeout
@@ -1,1 +1,1 @@
-5
+7
diff --git a/sql/test/BugTracker-2009/Tests/overflow.SF-2853458.sql
b/sql/test/BugTracker-2009/Tests/overflow.SF-2853458.sql
--- a/sql/test/BugTracker-2009/Tests/overflow.SF-2853458.sql
+++ b/sql/test/BugTracker-2009/Tests/overflow.SF-2853458.sql
@@ -1,1 +1,2 @@
select cast(power(2,63) as bigint);
+select cast(power(2,64) as bigint);
diff --git a/sql/test/BugTracker-2009/Tests/overflow.SF-2853458.stable.err
b/sql/test/BugTracker-2009/Tests/overflow.SF-2853458.stable.err
--- a/sql/test/BugTracker-2009/Tests/overflow.SF-2853458.stable.err
+++ b/sql/test/BugTracker-2009/Tests/overflow.SF-2853458.stable.err
@@ -70,6 +70,9 @@
MAPI = monetdb@alf:35561
QUERY = select cast(power(2,63) as bigint);
ERROR = !SQLException:convert:value (9223372036854775808.000000) exceeds
limits of type lng
+MAPI = monetdb@alf:35561
+QUERY = select cast(power(2,64) as bigint);
+ERROR = !SQLException:convert:value (18446744073709551616.000000) exceeds
limits of type lng
# 22:26:13 >
# 22:26:13 > Done.
diff --git
a/sql/test/BugTracker-2009/Tests/overflow.SF-2853458.stable.err.SunOS
b/sql/test/BugTracker-2009/Tests/overflow.SF-2853458.stable.err.SunOS
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2009/Tests/overflow.SF-2853458.stable.err.SunOS
@@ -0,0 +1,77 @@
+stderr of test 'overflow.SF-2853458` in directory 'test/BugTracker-2009`
itself:
+
+
+# 22:26:13 >
+# 22:26:13 > mserver5
"--config=/ufs/niels/scratch/rc/Linux-x86_64/etc/monetdb5.conf" --debug=10
--set gdk_nr_threads=0 --set
"monet_mod_path=/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB5:/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB5/lib:/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB5/bin"
--set "gdk_dbfarm=/ufs/niels/scratch/rc/Linux-x86_64/var/MonetDB5/dbfarm"
--set mapi_open=true --set xrpc_open=true --set mapi_port=35561 --set
xrpc_port=42240 --set monet_prompt= --trace
"--dbname=mTests_src_test_BugTracker-2009" --set mal_listing=0 "--dbinit=
include sql;" ; echo ; echo Over..
+# 22:26:13 >
+
+# builtin opt gdk_arch = 64bitx86_64-unknown-linux-gnu
+# builtin opt gdk_version = 1.32.0
+# builtin opt prefix = /ufs/niels/scratch/rc/Linux-x86_64
+# builtin opt exec_prefix = ${prefix}
+# builtin opt gdk_dbname = tst
+# builtin opt gdk_dbfarm = ${prefix}/var/MonetDB
+# builtin opt gdk_debug = 8
+# builtin opt gdk_alloc_map = yes
+# builtin opt gdk_vmtrim = yes
+# builtin opt monet_admin = adm
+# builtin opt monet_prompt = >
+# builtin opt monet_welcome = yes
+# builtin opt monet_mod_path = ${exec_prefix}/lib/MonetDB
+# builtin opt monet_daemon = yes
+# builtin opt host = localhost
+# builtin opt mapi_port = 50000
+# builtin opt mapi_noheaders = no
+# builtin opt mapi_debug = 0
+# builtin opt mapi_clients = 2
+# builtin opt sql_debug = 0
+# builtin opt standoff_ns = http://monetdb.cwi.nl/standoff
+# builtin opt standoff_start = start
+# builtin opt standoff_end = end
+# config opt prefix = /ufs/niels/scratch/rc/Linux-x86_64
+# config opt config = ${prefix}/etc/monetdb5.conf
+# config opt prefix = /ufs/niels/scratch/rc/Linux-x86_64
+# config opt exec_prefix = ${prefix}
+# config opt gdk_dbfarm = ${prefix}/var/MonetDB5/dbfarm
+# config opt gdk_dbname = demo
+# config opt gdk_alloc_map = no
+# config opt gdk_embedded = no
+# config opt gdk_debug = 0
+# config opt monet_mod_path =
${exec_prefix}/lib/MonetDB5:${exec_prefix}/lib/MonetDB5/lib:${exec_prefix}/lib/MonetDB5/bin
+# config opt monet_daemon = no
+# config opt monet_welcome = yes
+# config opt mero_msglog = ${prefix}/var/log/MonetDB/merovingian.log
+# config opt mero_errlog = ${prefix}/var/log/MonetDB/merovingian.log
+# config opt mero_pidfile = ${prefix}/var/run/MonetDB/merovingian.pid
+# config opt mal_init = ${exec_prefix}/lib/MonetDB5/mal_init.mal
+# config opt mal_listing = 2
+# config opt mapi_port = 50000
+# config opt mapi_autosense = false
+# config opt mapi_open = false
+# config opt sql_optimizer =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,garbageCollector,dataflow,history,multiplex
+# cmdline opt config = /ufs/niels/scratch/rc/Linux-x86_64/etc/monetdb5.conf
+# cmdline opt gdk_nr_threads = 0
+# cmdline opt monet_mod_path =
/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB5:/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB5/lib:/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB5/bin
+# cmdline opt gdk_dbfarm =
/ufs/niels/scratch/rc/Linux-x86_64/var/MonetDB5/dbfarm
+# cmdline opt mapi_open = true
+# cmdline opt xrpc_open = true
+# cmdline opt mapi_port = 35561
+# cmdline opt xrpc_port = 42240
+# cmdline opt monet_prompt =
+# cmdline opt gdk_dbname = mTests_src_test_BugTracker-2009
+# cmdline opt mal_listing = 0
+#warning: please don't forget to set your vault key!
+#(see /ufs/niels/scratch/rc/Linux-x86_64/etc/monetdb5.conf)
+
+# 22:26:13 >
+# 22:26:13 > mclient -lsql -umonetdb -Pmonetdb --host=alf --port=35561
+# 22:26:13 >
+
+MAPI = monetdb@alf:35561
+QUERY = select cast(power(2,64) as bigint);
+ERROR = !SQLException:convert:value (18446744073709551616.000000) exceeds
limits of type lng
+
+# 22:26:13 >
+# 22:26:13 > Done.
+# 22:26:13 >
+
diff --git
a/sql/test/BugTracker-2009/Tests/overflow.SF-2853458.stable.err.Windows
b/sql/test/BugTracker-2009/Tests/overflow.SF-2853458.stable.err.Windows
--- a/sql/test/BugTracker-2009/Tests/overflow.SF-2853458.stable.err.Windows
+++ b/sql/test/BugTracker-2009/Tests/overflow.SF-2853458.stable.err.Windows
@@ -70,6 +70,9 @@
MAPI = monetdb@alf:35561
QUERY = select cast(power(2,63) as bigint);
ERROR = !SQLException:convert:value (9223372036854775800.000000) exceeds
limits of type lng
+MAPI = monetdb@alf:35561
+QUERY = select cast(power(2,64) as bigint);
+ERROR = !SQLException:convert:value (18446744073709551616.000000) exceeds
limits of type lng
# 22:26:13 >
# 22:26:13 > Done.
diff --git
a/sql/test/BugTracker-2009/Tests/overflow.SF-2853458.stable.out.SunOS
b/sql/test/BugTracker-2009/Tests/overflow.SF-2853458.stable.out.SunOS
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2009/Tests/overflow.SF-2853458.stable.out.SunOS
@@ -0,0 +1,38 @@
+stdout of test 'overflow.SF-2853458` in directory 'test/BugTracker-2009`
itself:
+
+
+# 22:26:13 >
+# 22:26:13 > mserver5
"--config=/ufs/niels/scratch/rc/Linux-x86_64/etc/monetdb5.conf" --debug=10
--set gdk_nr_threads=0 --set
"monet_mod_path=/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB5:/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB5/lib:/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB5/bin"
--set "gdk_dbfarm=/ufs/niels/scratch/rc/Linux-x86_64/var/MonetDB5/dbfarm"
--set mapi_open=true --set xrpc_open=true --set mapi_port=35561 --set
xrpc_port=42240 --set monet_prompt= --trace
"--dbname=mTests_src_test_BugTracker-2009" --set mal_listing=0 "--dbinit=
include sql;" ; echo ; echo Over..
+# 22:26:13 >
+
+# MonetDB server v5.14.0, based on kernel v1.32.0
+# Serving database 'mTests_src_test_BugTracker-2009', using 4 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2009 MonetDB B.V., all rights reserved
+# Visit http://monetdb.cwi.nl/ for further information
+# Listening for connection requests on mapi:monetdb://alf.ins.cwi.nl:35561/
+# MonetDB/SQL module v2.32.0 loaded
+
+Ready.
+#function user.main():void;
+# clients.quit();
+#end main;
+
+Over..
+
+# 22:44:14 >
+# 22:44:14 > mclient -lsql -ftest -i -e --host=build-t1000-sol10 --port=31931
+# 22:44:14 >
+
+#select cast(power(2,63) as bigint);
+% . # table_name
+% power_single_value # name
+% bigint # type
+% 19 # length
+[ 9223372036854775807 ]
+
+# 22:44:15 >
+# 22:44:15 > Done.
+# 22:44:15 >
+
diff --git a/sql/test/BugTracker-2010/Tests/All
b/sql/test/BugTracker-2010/Tests/All
--- a/sql/test/BugTracker-2010/Tests/All
+++ b/sql/test/BugTracker-2010/Tests/All
@@ -22,8 +22,8 @@
decimal_div_whole_nrs.Bug-2579
SQLengine_error_on_join.Bug-2580
keycheck_crash.Bug-2583
+prepare_on_boolean_bug.Bug-2581
in_query_with_constants_fails.Bug-2582
-prepare_on_boolean_bug.Bug-2581
prepare_statements_crash_server.Bug-2599
and_not_broken.Bug-2602
insert-into-except.Bug-2569
diff --git a/sql/test/BugTracker/Tests/All b/sql/test/BugTracker/Tests/All
--- a/sql/test/BugTracker/Tests/All
+++ b/sql/test/BugTracker/Tests/All
@@ -1,6 +1,9 @@
# tests related to bug reports:
# <descriptive-name>.SF-<bug-report-id>[.<ext>]
+cardinality_violation.SF-1240701
+rank_over.SF-1691098
+with_only_once.SF-1720293
multi-column-constraint.SF-1964587
inserting_invalid_timestamp.SF-1363557
large_prepare.SF-1363729
@@ -11,7 +14,6 @@
update_with_correlated_subselect.SF-1284791
select_extract.SF-1263796
intersect_in_subquery.SF-1339411
-cardinality_violation.SF-1240701
rows_affected.SF-1377180
broken_join.SF-1373391
insert_not_exists.SF-1380287
@@ -46,7 +48,6 @@
caching.SF-1651599
decimal_prepare.SF-1655818
union_order
-rank_over.SF-1691098
revoke_role.SF-1691646
subquery_orderby.SF-1688915
limits_of_decimal.SF-1685357
@@ -67,7 +68,6 @@
local_global_temporary_table.SF-1715672
decimal.SF-1718253
alter-default.SF-1695290
-with_only_once.SF-1720293
bind_with_cast.SF-1720934
groupby_orderby_nonselected.SF-1723863
rand_not_executed_for_every_row.SF-1723791
diff --git a/sql/test/Connections/Tests/connections.stable.err.Windows
b/sql/test/Connections/Tests/connections.stable.err.Windows
new file mode 100644
--- /dev/null
+++ b/sql/test/Connections/Tests/connections.stable.err.Windows
@@ -0,0 +1,203 @@
+stderr of test 'connections` in directory 'test/Connections` itself:
+
+
+# 17:56:44 >
+# 17:56:44 > /usr/bin/python connections.py connections
+# 17:56:44 >
+
+
+server 11
+#mserver
+
+server 12
+#remote mserver
+
+server 12, client 1
+#client1
+MAPI = monetdb@alf:34263
+QUERY = connect to 'localhost' port 34 database
'mTests_src_test_Connections_test1' as 'test_db_1' user 'monetdb' password
'monetdb' language 'sql';
+ERROR = !IOException:mapi.connect:Could not connect: could not connect to
localhost:34: No error
+MAPI = monetdb@alf:34263
+QUERY = connect to 'localhost' port 34264 database
'mTests_src_test_Connections_test1' as 'test_db_1' language 'sql';
+ERROR = !syntax error, unexpected LANGUAGE, expecting USER in: "connect to
'localhost' port 34264 database 'mTests_src_test_Connections_test1' as
'test_db_1' language"
+MAPI = monetdb@alf:34263
+QUERY = connect to 'localhost' database 'mTests_src_test_Connections_test1';
+ERROR = !syntax error, unexpected SCOLON, expecting USER in: "connect to
'localhost' database 'mTests_src_test_Connections_test1';"
+MAPI = monetdb@alf:34263
+QUERY = connect 'localhost' port 34264 database
'mTests_src_test_Connections_test1' as 'test_db_1' user 'monetdb' password
'monetdb' language 'sql';
+ERROR = !syntax error, unexpected STRING, expecting TO in: "connect
'localhost'"
+MAPI = monetdb@alf:34263
+QUERY = connect to 'localhost' port 34264 as 'test_db_1' user 'monetdb'
password 'monetdb' language 'sql';
+ERROR = !syntax error, unexpected AS, expecting DATABASE in: "connect to
'localhost' port 34264 as"
+MAPI = monetdb@alf:34263
+QUERY = connect to 'localhost' port 34264 database
'mTests_src_test_Connections_test1' as 'test_db' user 'monetdb' language 'sql';
+ERROR = !syntax error, unexpected LANGUAGE, expecting PASSWORD in: "connect to
'localhost' port 34264 database 'mTests_src_test_Connections_test1' as
'test_db' user 'monetdb' language"
+MAPI = monetdb@alf:34263
+QUERY = disconnect 'test_db_1';
+ERROR = !DISCONNECT CATALOG: no such db_alias 'test_db_1'
+
+server 12, client 2
+#client1
+MAPI = monetdb@alf:34263
+QUERY = connect to 'localhost' port 34265 database
'mTests_src_test_Connections_test1' as 'test_db' user 'monetdb' password
'monetdb' language 'sql';
+ERROR = !CONNECT TO: this connection already exists or the db_alias 'test_db'
was already used!
+MAPI = monetdb@alf:34263
+QUERY = connect to 'localhost' port 34264 database
'mTests_src_test_Connections_test1' as 'test' user 'monetdb' password 'monetdb'
language 'sql';
+ERROR = !CONNECT TO: this connection already exists or the db_alias 'test' was
already used!
+MAPI = monetdb@alf:34263
+QUERY = connect to 'localhost' port 4000 database 'dmo' as 'test_db' user
'monetdb' password 'monetdb' language 'sql';
+ERROR = !CONNECT TO: this connection already exists or the db_alias 'test_db'
was already used!
+MAPI = monetdb@alf:34263
+QUERY = disconnect 'test_db';
+ERROR = !DISCONNECT CATALOG: no such db_alias 'test_db'
+MAPI = monetdb@alf:34263
+QUERY = disconnect 'test_tb';
+ERROR = !DISCONNECT CATALOG: no such db_alias 'test_tb'
+
+server 12, client 3
+#client1
+
+# builtin opt gdk_arch = 64bitx86_64-unknown-linux-gnu
+# builtin opt gdk_version = 1.27.0
+# builtin opt monet_pid = 6194
+# builtin opt prefix = /ufs/goncalve/scratch/MonetDB/current/debug/MonetDB/
+# builtin opt exec_prefix = ${prefix}
+# builtin opt gdk_dbname = tst
+# builtin opt gdk_dbfarm = ${prefix}/var/MonetDB
+# builtin opt gdk_debug = 8
+# builtin opt gdk_mem_bigsize = 262144
+# builtin opt gdk_alloc_map = yes
+# builtin opt gdk_mem_pagebits = 14
+# builtin opt gdk_vmtrim = yes
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
