Changeset: 04a7d2b8e0ac for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=04a7d2b8e0ac
Modified Files:
clients/Tests/SQL-dump_all.stable.out
clients/Tests/SQL-dump_all.stable.out.oid32
clients/Tests/SQL-dump_geom.stable.out
clients/Tests/SQL-dump_geom.stable.out.32bit
clients/Tests/SQL-dump_geom.stable.out.64bit.oid32
clients/Tests/SQL-dump_none.stable.out
monetdb5/modules/atoms/Tests/inet01.mal
monetdb5/modules/atoms/Tests/inet01.stable.out
sql/test/leaks/Tests/check1.stable.out
sql/test/leaks/Tests/check1_bam.stable.out
sql/test/leaks/Tests/check1_nogeom.stable.out
sql/test/leaks/Tests/check2.stable.out
sql/test/leaks/Tests/check2_bam.stable.out
sql/test/leaks/Tests/check2_nogeom.stable.out
sql/test/leaks/Tests/check3.stable.out
sql/test/leaks/Tests/check3_bam.stable.out
sql/test/leaks/Tests/check3_nogeom.stable.out
sql/test/leaks/Tests/check4.stable.out
sql/test/leaks/Tests/check4_bam.stable.out
sql/test/leaks/Tests/check4_nogeom.stable.out
sql/test/leaks/Tests/check5.stable.out
sql/test/leaks/Tests/check5_bam.stable.out
sql/test/leaks/Tests/check5_nogeom.stable.out
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
Branch: Oct2014
Log Message:
Approvals after recent changes. Also fixed inet01 test.
diffs (truncated from 582 to 300 lines):
diff --git a/clients/Tests/SQL-dump_all.stable.out
b/clients/Tests/SQL-dump_all.stable.out
--- a/clients/Tests/SQL-dump_all.stable.out
+++ b/clients/Tests/SQL-dump_all.stable.out
@@ -5723,7 +5723,7 @@ CREATE TABLE "sys"."dependencies" (
"depend_id" INTEGER,
"depend_type" SMALLINT
);
-COPY 227 RECORDS INTO "sys"."dependencies" FROM stdin USING DELIMITERS
'\t','\n','"';
+COPY 229 RECORDS INTO "sys"."dependencies" FROM stdin USING DELIMITERS
'\t','\n','"';
363 5243 7
364 5243 7
866 5243 7
@@ -5877,7 +5877,9 @@ 997 5610 7
184 5610 7
32 5622 7
427 5622 7
+111 5622 7
113 5622 7
+34 5622 7
5617 5622 7
5663 5671 5
5673 5679 5
diff --git a/clients/Tests/SQL-dump_all.stable.out.oid32
b/clients/Tests/SQL-dump_all.stable.out.oid32
--- a/clients/Tests/SQL-dump_all.stable.out.oid32
+++ b/clients/Tests/SQL-dump_all.stable.out.oid32
@@ -5723,7 +5723,7 @@ CREATE TABLE "sys"."dependencies" (
"depend_id" INTEGER,
"depend_type" SMALLINT
);
-COPY 227 RECORDS INTO "sys"."dependencies" FROM stdin USING DELIMITERS
'\t','\n','"';
+COPY 229 RECORDS INTO "sys"."dependencies" FROM stdin USING DELIMITERS
'\t','\n','"';
363 5243 7
364 5243 7
866 5243 7
@@ -5877,7 +5877,9 @@ 997 5610 7
207 5610 7
32 5622 7
427 5622 7
+111 5622 7
113 5622 7
+34 5622 7
5617 5622 7
5663 5671 5
5673 5679 5
diff --git a/clients/Tests/SQL-dump_geom.stable.out
b/clients/Tests/SQL-dump_geom.stable.out
--- a/clients/Tests/SQL-dump_geom.stable.out
+++ b/clients/Tests/SQL-dump_geom.stable.out
@@ -5624,7 +5624,7 @@ CREATE TABLE "sys"."dependencies" (
"depend_id" INTEGER,
"depend_type" SMALLINT
);
-COPY 204 RECORDS INTO "sys"."dependencies" FROM stdin USING DELIMITERS
'\t','\n','"';
+COPY 206 RECORDS INTO "sys"."dependencies" FROM stdin USING DELIMITERS
'\t','\n','"';
363 5243 7
364 5243 7
866 5243 7
@@ -5778,7 +5778,9 @@ 997 5610 7
184 5610 7
32 5622 7
427 5622 7
+111 5622 7
113 5622 7
+34 5622 7
5617 5622 7
5663 5671 5
5673 5679 5
diff --git a/clients/Tests/SQL-dump_geom.stable.out.32bit
b/clients/Tests/SQL-dump_geom.stable.out.32bit
--- a/clients/Tests/SQL-dump_geom.stable.out.32bit
+++ b/clients/Tests/SQL-dump_geom.stable.out.32bit
@@ -5624,7 +5624,7 @@ CREATE TABLE "sys"."dependencies" (
"depend_id" INTEGER,
"depend_type" SMALLINT
);
-COPY 204 RECORDS INTO "sys"."dependencies" FROM stdin USING DELIMITERS
'\t','\n','"';
+COPY 206 RECORDS INTO "sys"."dependencies" FROM stdin USING DELIMITERS
'\t','\n','"';
363 5243 7
364 5243 7
866 5243 7
@@ -5778,7 +5778,9 @@ 997 5610 7
230 5610 7
32 5622 7
427 5622 7
+111 5622 7
113 5622 7
+34 5622 7
5617 5622 7
5663 5671 5
5673 5679 5
diff --git a/clients/Tests/SQL-dump_geom.stable.out.64bit.oid32
b/clients/Tests/SQL-dump_geom.stable.out.64bit.oid32
--- a/clients/Tests/SQL-dump_geom.stable.out.64bit.oid32
+++ b/clients/Tests/SQL-dump_geom.stable.out.64bit.oid32
@@ -5624,7 +5624,7 @@ CREATE TABLE "sys"."dependencies" (
"depend_id" INTEGER,
"depend_type" SMALLINT
);
-COPY 204 RECORDS INTO "sys"."dependencies" FROM stdin USING DELIMITERS
'\t','\n','"';
+COPY 206 RECORDS INTO "sys"."dependencies" FROM stdin USING DELIMITERS
'\t','\n','"';
363 5243 7
364 5243 7
866 5243 7
@@ -5778,7 +5778,9 @@ 997 5610 7
207 5610 7
32 5622 7
427 5622 7
+111 5622 7
113 5622 7
+34 5622 7
5617 5622 7
5663 5671 5
5673 5679 5
diff --git a/clients/Tests/SQL-dump_none.stable.out
b/clients/Tests/SQL-dump_none.stable.out
--- a/clients/Tests/SQL-dump_none.stable.out
+++ b/clients/Tests/SQL-dump_none.stable.out
@@ -5423,7 +5423,7 @@ CREATE TABLE "sys"."dependencies" (
"depend_id" INTEGER,
"depend_type" SMALLINT
);
-COPY 204 RECORDS INTO "sys"."dependencies" FROM stdin USING DELIMITERS
'\t','\n','"';
+COPY 206 RECORDS INTO "sys"."dependencies" FROM stdin USING DELIMITERS
'\t','\n','"';
363 5243 7
364 5243 7
866 5243 7
@@ -5577,7 +5577,9 @@ 997 5610 7
184 5610 7
32 5622 7
427 5622 7
+111 5622 7
113 5622 7
+34 5622 7
5617 5622 7
5663 5671 5
5673 5679 5
diff --git a/monetdb5/modules/atoms/Tests/inet01.mal
b/monetdb5/modules/atoms/Tests/inet01.mal
--- a/monetdb5/modules/atoms/Tests/inet01.mal
+++ b/monetdb5/modules/atoms/Tests/inet01.mal
@@ -11,6 +11,9 @@ i4 := inet.new("192.168.0.3/24");
io.print(i4);
i5 := inet.new("/0");
+catch ParseException:str;
+io.printf("Caught parse exception\n");
+exit ParseException;
io.print(i5);
i6 := inet.new("127/32");
diff --git a/monetdb5/modules/atoms/Tests/inet01.stable.out
b/monetdb5/modules/atoms/Tests/inet01.stable.out
--- a/monetdb5/modules/atoms/Tests/inet01.stable.out
+++ b/monetdb5/modules/atoms/Tests/inet01.stable.out
@@ -22,6 +22,9 @@ function user.main():void;
i4 := inet.new("192.168.0.3/24");
io.print(i4);
i5 := inet.new("/0");
+catch ParseException:str ;
+ io.printf("Caught parse exception\n");
+exit ParseException:str ;
io.print(i5);
i6 := inet.new("127/32");
io.print(i6);
@@ -44,7 +47,8 @@ end main;
[ 192.168.0.0/24 ]
[ 192.168.0.0/16 ]
[ 192.168.0.3/24 ]
-[ 0.0.0.0/0 ]
+Caught parse exception
+[ (nil) ]
[ 127.0.0.0 ]
[ 127.0.0.0 ]
[ false ]
diff --git a/sql/test/leaks/Tests/check1.stable.out
b/sql/test/leaks/Tests/check1.stable.out
--- a/sql/test/leaks/Tests/check1.stable.out
+++ b/sql/test/leaks/Tests/check1.stable.out
@@ -91,8 +91,8 @@ Ready.
[ "oid", "int", 44 ]
[ "oid", "int", 44 ]
[ "oid", "int", 153 ]
-[ "oid", "int", 204 ]
-[ "oid", "int", 204 ]
+[ "oid", "int", 206 ]
+[ "oid", "int", 206 ]
[ "oid", "int", 286 ]
[ "oid", "int", 286 ]
[ "oid", "int", 286 ]
@@ -146,7 +146,7 @@ Ready.
[ "oid", "sht", 0 ]
[ "oid", "sht", 40 ]
[ "oid", "sht", 40 ]
-[ "oid", "sht", 204 ]
+[ "oid", "sht", 206 ]
[ "oid", "str", 0 ]
[ "oid", "str", 0 ]
[ "oid", "str", 0 ]
diff --git a/sql/test/leaks/Tests/check1_bam.stable.out
b/sql/test/leaks/Tests/check1_bam.stable.out
--- a/sql/test/leaks/Tests/check1_bam.stable.out
+++ b/sql/test/leaks/Tests/check1_bam.stable.out
@@ -97,8 +97,8 @@ Ready.
[ "oid", "int", 45 ]
[ "oid", "int", 45 ]
[ "oid", "int", 208 ]
-[ "oid", "int", 227 ]
-[ "oid", "int", 227 ]
+[ "oid", "int", 229 ]
+[ "oid", "int", 229 ]
[ "oid", "int", 329 ]
[ "oid", "int", 329 ]
[ "oid", "int", 329 ]
@@ -167,7 +167,7 @@ Ready.
[ "oid", "sht", 0 ]
[ "oid", "sht", 45 ]
[ "oid", "sht", 45 ]
-[ "oid", "sht", 227 ]
+[ "oid", "sht", 229 ]
[ "oid", "str", 0 ]
[ "oid", "str", 0 ]
[ "oid", "str", 0 ]
diff --git a/sql/test/leaks/Tests/check1_nogeom.stable.out
b/sql/test/leaks/Tests/check1_nogeom.stable.out
--- a/sql/test/leaks/Tests/check1_nogeom.stable.out
+++ b/sql/test/leaks/Tests/check1_nogeom.stable.out
@@ -91,8 +91,8 @@ Ready.
[ "oid", "int", 40 ]
[ "oid", "int", 40 ]
[ "oid", "int", 153 ]
-[ "oid", "int", 204 ]
-[ "oid", "int", 204 ]
+[ "oid", "int", 206 ]
+[ "oid", "int", 206 ]
[ "oid", "int", 286 ]
[ "oid", "int", 286 ]
[ "oid", "int", 286 ]
@@ -146,7 +146,7 @@ Ready.
[ "oid", "sht", 0 ]
[ "oid", "sht", 40 ]
[ "oid", "sht", 40 ]
-[ "oid", "sht", 204 ]
+[ "oid", "sht", 206 ]
[ "oid", "str", 0 ]
[ "oid", "str", 0 ]
[ "oid", "str", 0 ]
diff --git a/sql/test/leaks/Tests/check2.stable.out
b/sql/test/leaks/Tests/check2.stable.out
--- a/sql/test/leaks/Tests/check2.stable.out
+++ b/sql/test/leaks/Tests/check2.stable.out
@@ -91,8 +91,8 @@ Ready.
[ "oid", "int", 44 ]
[ "oid", "int", 44 ]
[ "oid", "int", 153 ]
-[ "oid", "int", 204 ]
-[ "oid", "int", 204 ]
+[ "oid", "int", 206 ]
+[ "oid", "int", 206 ]
[ "oid", "int", 286 ]
[ "oid", "int", 286 ]
[ "oid", "int", 286 ]
@@ -146,7 +146,7 @@ Ready.
[ "oid", "sht", 0 ]
[ "oid", "sht", 40 ]
[ "oid", "sht", 40 ]
-[ "oid", "sht", 204 ]
+[ "oid", "sht", 206 ]
[ "oid", "str", 0 ]
[ "oid", "str", 0 ]
[ "oid", "str", 0 ]
diff --git a/sql/test/leaks/Tests/check2_bam.stable.out
b/sql/test/leaks/Tests/check2_bam.stable.out
--- a/sql/test/leaks/Tests/check2_bam.stable.out
+++ b/sql/test/leaks/Tests/check2_bam.stable.out
@@ -97,8 +97,8 @@ Ready.
[ "oid", "int", 45 ]
[ "oid", "int", 45 ]
[ "oid", "int", 208 ]
-[ "oid", "int", 227 ]
-[ "oid", "int", 227 ]
+[ "oid", "int", 229 ]
+[ "oid", "int", 229 ]
[ "oid", "int", 329 ]
[ "oid", "int", 329 ]
[ "oid", "int", 329 ]
@@ -167,7 +167,7 @@ Ready.
[ "oid", "sht", 0 ]
[ "oid", "sht", 45 ]
[ "oid", "sht", 45 ]
-[ "oid", "sht", 227 ]
+[ "oid", "sht", 229 ]
[ "oid", "str", 0 ]
[ "oid", "str", 0 ]
[ "oid", "str", 0 ]
diff --git a/sql/test/leaks/Tests/check2_nogeom.stable.out
b/sql/test/leaks/Tests/check2_nogeom.stable.out
--- a/sql/test/leaks/Tests/check2_nogeom.stable.out
+++ b/sql/test/leaks/Tests/check2_nogeom.stable.out
@@ -91,8 +91,8 @@ Ready.
[ "oid", "int", 40 ]
[ "oid", "int", 40 ]
[ "oid", "int", 153 ]
-[ "oid", "int", 204 ]
-[ "oid", "int", 204 ]
+[ "oid", "int", 206 ]
+[ "oid", "int", 206 ]
[ "oid", "int", 286 ]
[ "oid", "int", 286 ]
[ "oid", "int", 286 ]
@@ -146,7 +146,7 @@ Ready.
[ "oid", "sht", 0 ]
[ "oid", "sht", 40 ]
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
