Changeset: 86d00c6c6a7e for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=86d00c6c6a7e Modified Files: sql/test/Tests/systemfunctions.stable.out sql/test/Tests/systemfunctions.stable.out.int128 sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out sql/test/testdb-upgrade/Tests/upgrade.stable.out sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128 Branch: Dec2016 Log Message:
Approvals. diffs (162 lines): diff --git a/sql/test/Tests/systemfunctions.stable.out b/sql/test/Tests/systemfunctions.stable.out --- a/sql/test/Tests/systemfunctions.stable.out +++ b/sql/test/Tests/systemfunctions.stable.out @@ -55,7 +55,7 @@ Ready. # 16:20:25 > #select s.name as "schema", f.name as "function", a.number as "argno", a.type as "argtype", case a.number when 0 then f.func else '' end as "definition" from sys.functions f, sys.schemas s, sys.args a where s.id = f.schema_id and f.id = a.func_id and f.id in (select * from sys.systemfunctions) order by s.name, f.name, f.id, a.number; -% sys.L4, sys.L5, sys.L6, sys.L7, sys.L10 # table_name +% sys.L14, sys.L16, sys.L20, sys.L22, sys.L24 # table_name % schema, function, argno, argtype, definition # name % varchar, varchar, int, varchar, varchar # type % 8, 35, 2, 14, 611 # length @@ -3051,9 +3051,9 @@ Ready. [ "sys", "setmasklen", 0, "inet", "create function \"setmasklen\" (p inet, mask int) returns inet\n external name inet.\"setmasklen\";" ] [ "sys", "setmasklen", 1, "inet", "" ] [ "sys", "setmasklen", 2, "int", "" ] -[ "sys", "setsession", 0, "bigint", "create procedure sys.setsession(\"timeout\" bigint)\n external name sql.setsession;" ] -[ "sys", "settimeout", 0, "bigint", "create procedure sys.settimeout(\"query\" bigint)\n external name sql.settimeout;" ] -[ "sys", "settimeout", 0, "bigint", "create procedure sys.settimeout(\"query\" bigint, \"session\" bigint)\n external name sql.settimeout;" ] +[ "sys", "setsession", 0, "bigint", "create procedure sys.setsession(\"timeout\" bigint)\n external name clients.setsession;" ] +[ "sys", "settimeout", 0, "bigint", "create procedure sys.settimeout(\"query\" bigint)\n external name clients.settimeout;" ] +[ "sys", "settimeout", 0, "bigint", "create procedure sys.settimeout(\"query\" bigint, \"session\" bigint)\n external name clients.settimeout;" ] [ "sys", "settimeout", 1, "bigint", "" ] [ "sys", "shpattach", 0, "clob", "create procedure shpattach(fname string) external name shp.attach;" ] [ "sys", "shpload", 0, "int", "create procedure shpload(fid integer) external name shp.load;" ] diff --git a/sql/test/Tests/systemfunctions.stable.out.int128 b/sql/test/Tests/systemfunctions.stable.out.int128 --- a/sql/test/Tests/systemfunctions.stable.out.int128 +++ b/sql/test/Tests/systemfunctions.stable.out.int128 @@ -55,7 +55,7 @@ Ready. # 16:20:25 > #select s.name as "schema", f.name as "function", a.number as "argno", a.type as "argtype", case a.number when 0 then f.func else '' end as "definition" from sys.functions f, sys.schemas s, sys.args a where s.id = f.schema_id and f.id = a.func_id and f.id in (select * from sys.systemfunctions) order by s.name, f.name, f.id, a.number; -% sys.L4, sys.L5, sys.L6, sys.L7, sys.L10 # table_name +% sys.L14, sys.L16, sys.L20, sys.L22, sys.L24 # table_name % schema, function, argno, argtype, definition # name % varchar, varchar, int, varchar, varchar # type % 8, 35, 2, 14, 611 # length @@ -3413,9 +3413,9 @@ Ready. [ "sys", "setmasklen", 0, "inet", "create function \"setmasklen\" (p inet, mask int) returns inet\n external name inet.\"setmasklen\";" ] [ "sys", "setmasklen", 1, "inet", "" ] [ "sys", "setmasklen", 2, "int", "" ] -[ "sys", "setsession", 0, "bigint", "create procedure sys.setsession(\"timeout\" bigint)\n external name sql.setsession;" ] -[ "sys", "settimeout", 0, "bigint", "create procedure sys.settimeout(\"query\" bigint)\n external name sql.settimeout;" ] -[ "sys", "settimeout", 0, "bigint", "create procedure sys.settimeout(\"query\" bigint, \"session\" bigint)\n external name sql.settimeout;" ] +[ "sys", "setsession", 0, "bigint", "create procedure sys.setsession(\"timeout\" bigint)\n external name clients.setsession;" ] +[ "sys", "settimeout", 0, "bigint", "create procedure sys.settimeout(\"query\" bigint)\n external name clients.settimeout;" ] +[ "sys", "settimeout", 0, "bigint", "create procedure sys.settimeout(\"query\" bigint, \"session\" bigint)\n external name clients.settimeout;" ] [ "sys", "settimeout", 1, "bigint", "" ] [ "sys", "shpattach", 0, "clob", "create procedure shpattach(fname string) external name shp.attach;" ] [ "sys", "shpload", 0, "int", "create procedure shpload(fid integer) external name shp.load;" ] diff --git a/sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out b/sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out --- a/sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out +++ b/sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out @@ -230,8 +230,8 @@ set schema "testschema"; # 11:40:10 > #select count(*) from testschema.smallstring; -% testschema.L2 # table_name -% L1 # name +% testschema.L4 # table_name +% L3 # name % bigint # type % 2 # length [ 66 ] 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 @@ -227,8 +227,8 @@ set schema "testschema"; # 11:47:59 > #select count(*) from testschema.smallstring; -% testschema.L2 # table_name -% L1 # name +% testschema.L4 # table_name +% L3 # name % bigint # type % 2 # length [ 66 ] diff --git a/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit b/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit --- a/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit +++ b/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit @@ -483,8 +483,8 @@ set schema "testschema"; # 13:26:28 > #select count(*) from testschema.smallstring; -% testschema.L2 # table_name -% L1 # name +% testschema.L4 # table_name +% L3 # name % bigint # type % 2 # length [ 66 ] diff --git a/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128 b/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128 --- a/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128 +++ b/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128 @@ -271,8 +271,8 @@ set schema "testschema"; # 12:48:11 > #select count(*) from testschema.smallstring; -% testschema.L2 # table_name -% L1 # name +% testschema.L4 # table_name +% L3 # name % bigint # type % 2 # length [ 66 ] diff --git a/sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out b/sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out --- a/sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out +++ b/sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out @@ -232,8 +232,8 @@ set schema "testschema"; # 11:40:12 > #select count(*) from testschema.smallstring; -% testschema.L2 # table_name -% L1 # name +% testschema.L4 # table_name +% L3 # name % bigint # type % 2 # length [ 66 ] 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 @@ -227,8 +227,8 @@ set schema "testschema"; # 11:47:58 > #select count(*) from testschema.smallstring; -% testschema.L2 # table_name -% L1 # name +% testschema.L4 # table_name +% L3 # name % bigint # type % 2 # length [ 66 ] diff --git a/sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit b/sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit --- a/sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit +++ b/sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit @@ -471,8 +471,8 @@ set schema "testschema"; # 13:26:27 > #select count(*) from testschema.smallstring; -% testschema.L2 # table_name -% L1 # name +% testschema.L4 # table_name +% L3 # name % bigint # type % 2 # length [ 66 ] diff --git a/sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128 b/sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128 --- a/sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128 +++ b/sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128 @@ -268,8 +268,8 @@ set schema "testschema"; # 11:43:08 > #select count(*) from testschema.smallstring; -% testschema.L2 # table_name -% L1 # name +% testschema.L4 # table_name +% L3 # name % bigint # type % 2 # length [ 66 ] _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
