Changeset: a3d0d0d7a00f for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a3d0d0d7a00f Modified Files: Branch: default Log Message:
Merge with Oct2010 branch.
diffs (138 lines):
diff -r eb3d40754502 -r a3d0d0d7a00f
MonetDB4/tests/Availability/Tests/00_Mserver.stable.out
--- a/MonetDB4/tests/Availability/Tests/00_Mserver.stable.out Tue Oct 26
09:01:11 2010 +0200
+++ b/MonetDB4/tests/Availability/Tests/00_Mserver.stable.out Tue Oct 26
09:23:36 2010 +0200
@@ -81,7 +81,7 @@
[ "MODULES", "str", "str", 48, 0, "clean",
"load", "pers", 0, 2 ]
[ "adm_atomtbl", "str", "int", 15, 0, "dirty",
"load", "tran", 1, 1 ]
[ "adm_fcntbl", "str", "oid", 1036, 0, "dirty",
"load", "tran", 1, 1 ]
-[ "monet_environment", "str", "str", 42, 0, "dirty",
"load", "tran", 1, 1 ]
+[ "monet_environment", "str", "str", 45, 0, "dirty",
"load", "tran", 1, 1 ]
[ "monet_fcn_aut", "oid", "str", 965, 0, "dirty",
"load", "tran", 1, 2 ]
[ "monet_fcn_cnt", "oid", "int", 1036, 0, "dirty",
"load", "tran", 1, 2 ]
[ "monet_fcn_dat", "oid", "str", 965, 0, "dirty",
"load", "tran", 1, 2 ]
diff -r eb3d40754502 -r a3d0d0d7a00f
MonetDB4/tests/Availability/Tests/00_Mserver.stable.out.STATIC
--- a/MonetDB4/tests/Availability/Tests/00_Mserver.stable.out.STATIC Tue Oct
26 09:01:11 2010 +0200
+++ b/MonetDB4/tests/Availability/Tests/00_Mserver.stable.out.STATIC Tue Oct
26 09:23:36 2010 +0200
@@ -75,7 +75,7 @@
[ "MODULES", "str", "str", 46, 0, "clean",
"load", "pers", 0, 2 ]
[ "adm_atomtbl", "str", "int", 15, 0, "dirty",
"load", "tran", 1, 1 ]
[ "adm_fcntbl", "str", "oid", 1036, 0, "dirty",
"load", "tran", 1, 1 ]
-[ "monet_environment", "str", "str", 42, 0, "dirty",
"load", "tran", 1, 1 ]
+[ "monet_environment", "str", "str", 45, 0, "dirty",
"load", "tran", 1, 1 ]
[ "monet_fcn_aut", "oid", "str", 965, 0, "dirty",
"load", "tran", 1, 2 ]
[ "monet_fcn_cnt", "oid", "int", 1036, 0, "dirty",
"load", "tran", 1, 2 ]
[ "monet_fcn_dat", "oid", "str", 965, 0, "dirty",
"load", "tran", 1, 2 ]
diff -r eb3d40754502 -r a3d0d0d7a00f
MonetDB4/tests/Availability/Tests/00_Mserver.stable.out.Windows
--- a/MonetDB4/tests/Availability/Tests/00_Mserver.stable.out.Windows Tue Oct
26 09:01:11 2010 +0200
+++ b/MonetDB4/tests/Availability/Tests/00_Mserver.stable.out.Windows Tue Oct
26 09:23:36 2010 +0200
@@ -76,7 +76,7 @@
[ "MODULES", "str", "str", 47, 0, "clean",
"load", "pers", 0, 2 ]
[ "adm_atomtbl", "str", "int", 15, 0, "dirty",
"load", "tran", 1, 1 ]
[ "adm_fcntbl", "str", "oid", 1036, 0, "dirty",
"load", "tran", 1, 1 ]
-[ "monet_environment", "str", "str", 42, 0, "dirty",
"load", "tran", 1, 1 ]
+[ "monet_environment", "str", "str", 45, 0, "dirty",
"load", "tran", 1, 1 ]
[ "monet_fcn_aut", "oid", "str", 965, 0, "dirty",
"load", "tran", 1, 2 ]
[ "monet_fcn_cnt", "oid", "int", 1036, 0, "dirty",
"load", "tran", 1, 2 ]
[ "monet_fcn_dat", "oid", "str", 965, 0, "dirty",
"load", "tran", 1, 2 ]
diff -r eb3d40754502 -r a3d0d0d7a00f
MonetDB4/tests/BugTracker/Tests/project_on_BAT_with_batFirst.SF-2020806.stable.out
---
a/MonetDB4/tests/BugTracker/Tests/project_on_BAT_with_batFirst.SF-2020806.stable.out
Tue Oct 26 09:01:11 2010 +0200
+++
b/MonetDB4/tests/BugTracker/Tests/project_on_BAT_with_batFirst.SF-2020806.stable.out
Tue Oct 26 09:23:36 2010 +0200
@@ -33,6 +33,7 @@
#-----------------------------------------#
[ "config", 1 ]
[ "datadir", 1 ]
+[ "default_pipe", 1 ]
[ "gdk_alloc_map", 1 ]
[ "gdk_arch", 1 ]
[ "gdk_dbfarm", 1 ]
@@ -48,9 +49,11 @@
[ "mapi_clients", 1 ]
[ "mapi_open", 1 ]
[ "mapi_port", 1 ]
+[ "minimal_pipe", 1 ]
[ "monet_admin", 1 ]
[ "monet_cwd", 1 ]
[ "monet_version", 1 ]
+[ "sql_optimizer", 1 ]
[ "standoff_end", 1 ]
[ "standoff_ns", 1 ]
[ "standoff_start", 1 ]
diff -r eb3d40754502 -r a3d0d0d7a00f
MonetDB4/tests/suite_08/Tests/test_01.stable.out
--- a/MonetDB4/tests/suite_08/Tests/test_01.stable.out Tue Oct 26 09:01:11
2010 +0200
+++ b/MonetDB4/tests/suite_08/Tests/test_01.stable.out Tue Oct 26 09:23:36
2010 +0200
@@ -243,36 +243,36 @@
# str str
# type
#----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------#
[ "gdk_arch", "64bitx86_64-unknown-linux-gnu"
]
-[ "gdk_version", "1.28.0"
]
-[ "monet_pid", "25852"
]
-[ "prefix",
"/ufs/manegold/_/scratch0/Monet/Testing/Stable/prefix.--enable-strict_--disable-debug_--enable-optimize_--enable-assert"
]
-[ "exec_prefix",
"/ufs/manegold/_/scratch0/Monet/Testing/Stable/prefix.--enable-strict_--disable-debug_--enable-optimize_--enable-assert"
]
+[ "gdk_version", "1.40.0"
]
+[ "prefix", "/ufs/sjoerd/Monet-candidate"
]
+[ "exec_prefix", "/ufs/sjoerd/Monet-candidate"
]
[ "gdk_dbname", "mTests_tests_suite_08"
]
-[ "gdk_dbfarm",
"/ufs/manegold/_/scratch0/Monet/Testing/Stable/build.--enable-strict_--disable-debug_--enable-optimize_--enable-assert/MonetDB4/dbfarm"
]
+[ "gdk_dbfarm",
"/ufs/sjoerd/Monet-candidate/var/MonetDB4/dbfarm"
]
[ "gdk_debug", "10"
]
-[ "gdk_mem_bigsize", "262144"
]
[ "gdk_alloc_map", "no"
]
-[ "gdk_mem_pagebits", "14"
]
[ "gdk_vmtrim", "yes"
]
[ "monet_admin", "adm"
]
[ "monet_prompt", ""
]
[ "monet_welcome", "yes"
]
-[ "monet_mod_path",
"/ufs/manegold/_/scratch0/Monet/Testing/Stable/build.--enable-strict_--disable-debug_--enable-optimize_--enable-assert/MonetDB4/src/modules/plain/.libs:/ufs/manegold/_/scratch0/Monet/Testing/Stable/build.--enable-strict_--disable-debug_--enable-optimize_--enable-assert/MonetDB4/src/modules/plain:/ufs/manegold/_/scratch0/Monet/Testing/Stable/build.--enable-strict_--disable-debug_--enable-optimize_--enable-assert/MonetDB4/src/modules/contrib/.libs:/ufs/manegold/_/scratch0/Monet/Testing/Stable/build.--enable-strict_--disable-debug_--enable-optimize_--enable-assert/MonetDB4/src/modules/contrib:/ufs/manegold/_/scratch0/Monet/Testing/Stable/build.--enable-strict_--disable-debug_--enable-optimize_--enable-assert/MonetDB4/src/modules/calibrator/.libs:/ufs/manegold/_/scratch0/Monet/Testing/Stable/build.--enable-strict_--disable-debug_--enable-optimize_--enable-assert/MonetDB4/src/modules/calibrator:/ufs/manegold/_/scratch0/Monet/Testing/Stable/build.--enable-str
ict_--disable-debug_--enable-optimize_--enable-assert/MonetDB4/src/mapi/.libs:/ufs/manegold/_/scratch0/Monet/Testing/Stable/build.--enable-strict_--disable-debug_--enable-optimize_--enable-assert/MonetDB4/src/mapi:/ufs/manegold/_/scratch0/Monet/Testing/Stable/source/MonetDB4/scripts/tools"
]
+[ "monet_mod_path",
"/ufs/sjoerd/Monet-candidate/lib64/MonetDB4:/ufs/sjoerd/Monet-candidate/lib64/MonetDB4/lib:/ufs/sjoerd/Monet-candidate/lib64/MonetDB4/bin"
]
[ "monet_daemon", "no"
]
[ "host", "localhost"
]
-[ "mapi_port", "33016"
]
+[ "mapi_port", "39303"
]
[ "mapi_clients", "2"
]
+[ "mapi_open", "true"
]
+[ "mapi_autosense", "false"
]
+[ "default_pipe",
"inline,remap,evaluate,costModel,coercions,emptySet,aliases,mitosis,mergetable,deadcode,commonTerms,joinPath,reorder,deadcode,reduce,dataflow,history,multiplex,garbageCollector"
]
+[ "minimal_pipe", "inline,remap,deadcode,multiplex,garbageCollector"
]
+[ "sql_optimizer", "default_pipe"
]
[ "sql_debug", "0"
]
[ "standoff_ns", ""
]
[ "standoff_start", "start"
]
[ "standoff_end", "end"
]
-[ "config",
"/ufs/manegold/_/scratch0/Monet/Testing/Stable/build.--enable-strict_--disable-debug_--enable-optimize_--enable-assert/MonetDB4/conf/MonetDB.conf"
]
+[ "config", "/ufs/sjoerd/Monet-candidate/etc/MonetDB.conf"
]
[ "gdk_nr_threads", "1"
]
-[ "mapi_autosense", "false"
]
-[ "mapi_open", "true"
]
[ "xrpc_open", "true"
]
-[ "xrpc_port", "47741"
]
-[ "datadir",
"/ufs/manegold/_/scratch0/Monet/Testing/Stable/prefix.--enable-strict_--disable-debug_--enable-optimize_--enable-assert/share"
]
+[ "xrpc_port", "43002"
]
+[ "datadir", "/ufs/sjoerd/Monet-candidate/share"
]
[ "gdk_embedded", "no"
]
[ "xquery_output", "dm"
]
[ "xquery_cacheMB", "100"
]
@@ -281,9 +281,12 @@
[ "xrpc_options", ""
]
[ "xrpc_admin",
"http://127.0.0.1;127.0.0.1;http://localhost;localhost";
]
[ "xrpc_user",
"http://127.0.0.1;127.0.0.1;http://localhost;localhost";
]
-[ "xrpc_trusted",
"http://monetdb.cwi.nl;http://127.0.0.1;http://localhost;/ufs/manegold/_/scratch0/Monet/Testing/Stable/prefix.--enable-strict_--disable-debug_--enable-optimize_--enable-assert/share/MonetDB/xrpc/export";
]
-[ "monet_cwd",
"/net/rig.ins.cwi.nl/export/scratch0/manegold/Monet/Testing/Stable/build.--enable-strict_--disable-debug_--enable-optimize_--enable-assert/MonetDB4/mTests/tests/suite_08"
]
-[ "monet_version", "4.28.0"
]
+[ "xrpc_trusted",
"http://monetdb.cwi.nl;http://127.0.0.1;http://localhost;/ufs/sjoerd/Monet-candidate/share/MonetDB/xrpc/export";
]
+[ "monet_cwd",
"/net/ottar/export/scratch0/sjoerd/bin/candidate/mTests/tests/suite_08"
]
+[ "gdk_mem_pagebits", "14"
]
+[ "gdk_mem_bigsize", "1048576"
]
+[ "monet_pid", "25727"
]
+[ "monet_version", "4.40.0"
]
#~EndVariableOutput~#
# Pseudo bat to map thread to name
@@ -313,7 +316,7 @@
# BAT: login #
# (int) (str) #
#-----------------------------------------#
-[ 0, "Fri Mar 20 09:23:19 2009" ]
+[ 0, "Tue Oct 26 09:21:49 2010" ]
#~EndVariableOutput~#
# Pseudo bat to map client identifier to its current active tree
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
