Changeset: b9a64f1f477d for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b9a64f1f477d
Modified Files:
sql/test/leaks/Tests/check0_nogeom.stable.out
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
sql/test/testdb-upgrade/Tests/upgrade.stable.out
Branch: default
Log Message:
Merge with Feb2013 branch.
diffs (84 lines):
diff --git a/sql/test/leaks/Tests/check0_nogeom.stable.out
b/sql/test/leaks/Tests/check0_nogeom.stable.out
--- a/sql/test/leaks/Tests/check0_nogeom.stable.out
+++ b/sql/test/leaks/Tests/check0_nogeom.stable.out
@@ -47,39 +47,31 @@ Ready.
% .bbp, .bbp, .bbp # table_name
% htype, ttype, count # name
% clob, clob, bigint # type
-% 3, 3, 4 # length
+% 3, 3, 3 # length
+[ "oid", "int", 0 ]
+[ "oid", "int", 0 ]
[ "oid", "int", 1 ]
[ "oid", "int", 1 ]
[ "oid", "int", 2 ]
-[ "oid", "int", 8 ]
-[ "oid", "int", 8 ]
[ "oid", "int", 135 ]
-[ "oid", "int", 1189 ]
-[ "oid", "int", 3234 ]
-[ "oid", "int", 3234 ]
-[ "oid", "int", 3234 ]
-[ "oid", "int", 3234 ]
-[ "oid", "int", 3234 ]
[ "oid", "lng", 1 ]
[ "oid", "lng", 2 ]
[ "oid", "str", 1 ]
[ "oid", "str", 1 ]
[ "oid", "str", 1 ]
[ "oid", "str", 135 ]
-[ "oid", "str", 3234 ]
-[ "oid", "str", 3234 ]
#select 'transient', count(*) from bbp() as bbp where kind like 'tran%';
% .L1, .L2 # table_name
% L1, L2 # name
% char, wrd # type
% 9, 3 # length
-[ "transient", 355 ]
+[ "transient", 365 ]
#select 'persistent', count(*) from bbp() as bbp where kind like 'pers%';
% .L1, .L2 # table_name
% L1, L2 # name
% char, wrd # type
% 10, 2 # length
-[ "persistent", 20 ]
+[ "persistent", 12 ]
# 22:02:15 >
# 22:02:15 > Done.
diff --git a/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
b/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
--- a/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
+++ b/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
@@ -19,14 +19,6 @@ stdout of test 'upgrade` in directory 's
# MonetDB/SQL module loaded
Ready.
-Running database upgrade commands:
-create aggregate sys.stddev_samp(val WRD) returns DOUBLE external name
"aggr"."stdev";
-create aggregate sys.stddev_pop(val WRD) returns DOUBLE external name
"aggr"."stdevp";
-create aggregate sys.var_samp(val WRD) returns DOUBLE external name
"aggr"."variance";
-create aggregate sys.var_pop(val WRD) returns DOUBLE external name
"aggr"."variancep";
-create aggregate sys.median(val WRD) returns WRD external name "aggr"."median";
-create aggregate sys.corr(e1 WRD, e2 WRD) returns WRD external name
"aggr"."corr";
-insert into sys.systemfunctions (select f.id from sys.functions f, sys.schemas
s where f.name in ('stddev_samp', 'stddev_pop', 'var_samp', 'var_pop',
'median', 'corr') and f.type = 3 and f.schema_id = s.id and s.name = 'sys');
Running database upgrade commands:
set schema "sys";
diff --git a/sql/test/testdb-upgrade/Tests/upgrade.stable.out
b/sql/test/testdb-upgrade/Tests/upgrade.stable.out
--- a/sql/test/testdb-upgrade/Tests/upgrade.stable.out
+++ b/sql/test/testdb-upgrade/Tests/upgrade.stable.out
@@ -19,14 +19,6 @@ stdout of test 'upgrade` in directory 's
# MonetDB/SQL module loaded
Ready.
-Running database upgrade commands:
-create aggregate sys.stddev_samp(val WRD) returns DOUBLE external name
"aggr"."stdev";
-create aggregate sys.stddev_pop(val WRD) returns DOUBLE external name
"aggr"."stdevp";
-create aggregate sys.var_samp(val WRD) returns DOUBLE external name
"aggr"."variance";
-create aggregate sys.var_pop(val WRD) returns DOUBLE external name
"aggr"."variancep";
-create aggregate sys.median(val WRD) returns WRD external name "aggr"."median";
-create aggregate sys.corr(e1 WRD, e2 WRD) returns WRD external name
"aggr"."corr";
-insert into sys.systemfunctions (select f.id from sys.functions f, sys.schemas
s where f.name in ('stddev_samp', 'stddev_pop', 'var_samp', 'var_pop',
'median', 'corr') and f.type = 3 and f.schema_id = s.id and s.name = 'sys');
Running database upgrade commands:
set schema "sys";
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
