Changeset: 651c6981b91d for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=651c6981b91d Modified Files: Branch: Oct2010 Log Message:
Merge. diffs (47 lines): diff -r 658dd71eabd0 -r 651c6981b91d MonetDB4/tests/Availability/Tests/00_Mserver.stable.out --- a/MonetDB4/tests/Availability/Tests/00_Mserver.stable.out Sat Oct 02 12:30:05 2010 +0200 +++ b/MonetDB4/tests/Availability/Tests/00_Mserver.stable.out Sat Oct 02 12:30:49 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", 43, 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 658dd71eabd0 -r 651c6981b91d MonetDB4/tests/Availability/Tests/00_Mserver.stable.out.STATIC --- a/MonetDB4/tests/Availability/Tests/00_Mserver.stable.out.STATIC Sat Oct 02 12:30:05 2010 +0200 +++ b/MonetDB4/tests/Availability/Tests/00_Mserver.stable.out.STATIC Sat Oct 02 12:30:49 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", 43, 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 658dd71eabd0 -r 651c6981b91d MonetDB4/tests/Availability/Tests/00_Mserver.stable.out.Windows --- a/MonetDB4/tests/Availability/Tests/00_Mserver.stable.out.Windows Sat Oct 02 12:30:05 2010 +0200 +++ b/MonetDB4/tests/Availability/Tests/00_Mserver.stable.out.Windows Sat Oct 02 12:30:49 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", 43, 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 658dd71eabd0 -r 651c6981b91d MonetDB4/tests/suite_08/Tests/test_01.stable.out --- a/MonetDB4/tests/suite_08/Tests/test_01.stable.out Sat Oct 02 12:30:05 2010 +0200 +++ b/MonetDB4/tests/suite_08/Tests/test_01.stable.out Sat Oct 02 12:30:49 2010 +0200 @@ -284,6 +284,7 @@ [ "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" ] +[ "gdk_testing", "true" ] #~EndVariableOutput~# # Pseudo bat to map thread to name _______________________________________________ Checkin-list mailing list [email protected] http://mail.monetdb.org/mailman/listinfo/checkin-list
