Changeset: 9cf9fb7ad553 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9cf9fb7ad553 Modified Files: clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.int128 sql/test/emptydb/Tests/check.stable.out Branch: merge-partitions Log Message:
Merge with default diffs (57 lines): diff --git a/clients/Tests/MAL-signatures.stable.out b/clients/Tests/MAL-signatures.stable.out --- a/clients/Tests/MAL-signatures.stable.out +++ b/clients/Tests/MAL-signatures.stable.out @@ -52,6 +52,11 @@ stdout of test 'MAL-signatures` in direc # loading sql script: 85_bam.sql # loading sql script: 90_generator.sql # loading sql script: 99_system.sql +# MonetDB/SQL module loaded +# MonetDB/Python2 module loaded +# MonetDB/R module loaded + +Ready. # 14:39:22 > # 14:39:22 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-23085" "--port=30158" diff --git a/clients/Tests/MAL-signatures.stable.out.int128 b/clients/Tests/MAL-signatures.stable.out.int128 --- a/clients/Tests/MAL-signatures.stable.out.int128 +++ b/clients/Tests/MAL-signatures.stable.out.int128 @@ -56,6 +56,9 @@ stdout of test 'MAL-signatures` in direc # loading sql script: 90_generator.sql # loading sql script: 90_generator_hge.sql # loading sql script: 99_system.sql +# MonetDB/SQL module loaded +# MonetDB/Python2 module loaded +# MonetDB/R module loaded Ready. diff --git a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.int128 b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.int128 --- a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.int128 +++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.int128 @@ -5393,13 +5393,6 @@ set schema "sys"; commit; Running database upgrade commands: -set schema "sys"; -drop function sys.chi2prob(double, double); -delete from systemfunctions where function_id not in (select id from functions); -set schema "sys"; -commit; - -Running database upgrade commands: set schema sys; create aggregate sys.group_concat(str string) returns string external name "aggr"."str_group_concat"; grant execute on aggregate sys.group_concat(string) to public; diff --git a/sql/test/emptydb/Tests/check.stable.out b/sql/test/emptydb/Tests/check.stable.out --- a/sql/test/emptydb/Tests/check.stable.out +++ b/sql/test/emptydb/Tests/check.stable.out @@ -2033,7 +2033,7 @@ drop function pcre_replace(string, strin % .s, .f, .L4, .f, .fl, .ft, .f, .f, .f, .L14, .L16, .L20, .L22, .L24, .L26, .L30, .L32, .L34, .L36, .L40, .L42, .L44, .L46, .L50, .L52, .L54, .L56, .L60, .L62, .L64, .L66, .L70, .L72, .L74, .L76, .L100, .L102, .L104, .L106, .L110, .L112, .L114, .L116, .L120, .L122, .L124, .L126, .L130, .L132, .L134, .L136, .L140, .L142, .L144, .L146, .L150, .L152, .L154, .L156, .L160, .L162, .L164, .L166, .L170, .L172, .L174, .L176, .L200, .L202, .L204, .L206, .L210, .L212, .L214, .L216, .L220, .L222, .L224, .L226, .L230, .L232, .L234, .L236, .L240, .L242, .L244, .L246, .L250, .L252 # table_name % name, name, query, mod, language_name, function_type_name, side_effect, varres, vararg, name0, type0, type_digits0, type_scale0, inout0, name1, type1, type_digits1, type_scale1, inout1, name2, type2, type_digits2, type_scale2, inout2, name3, type3, type_digits3, type_scale3, inout3, name4, type4, type_digits4, type_scale4, inout4, name5, type5, type_digits5, type_scale5, inout5, name6, type6, type_digits6, type_scale6, inout6, name7, type7, type_digits7, type_scale7, inout7, name8, type8, type_digits8, type_scale8, inout8, name9, type9, type_digits9, type_scale9, inout9, name10, type10, type_digits10, type_scale10, inout10, name11, type11, type_digits11, type_scale11, inout11, name12, type12, type_digits12, type_scale12, inout12, name13, type13, type_digits13, type_scale13, inout13, name14, type14, type_digits14, type_scale14, inout14, name15, type15, type_digits15, type_scale15, inout15 # name % varchar, varchar, varchar, varchar, varchar, varchar, boolean, boolean, boolean, varchar, varchar, int, int, char, varchar, varchar, int, int, char, varchar, varchar, int, int, char, varchar, varchar, int, int, char, varchar, varchar, int, int, char, varchar, varchar, int, int, char, varchar, varchar, int, int, char, varchar, varchar, int, int, char, varchar, varchar, int, int, char, varchar, varchar, int, int, char, varchar, varchar, int, int, char, varchar, varchar, int, int, char, varchar, varchar, int, int, char, varchar, varchar, int, int, char, varchar, varchar, int, int, char, varchar, varchar, int, int, char # type -% 8, 35, 831, 9, 10, 26, 5, 5, 5, 11, 14, 4, 1, 3, 16, 14, 4, 1, 3, 16, 14, 2, 1, 3, 27, 12, 2, 1, 3, 12, 7, 2, 1, 3, 10, 7, 2, 1, 3, 8, 7, 2, 1, 3, 9, 6, 2, 1, 3, 10, 6, 2, 1, 3, 8, 7, 2, 1, 3, 9, 7, 2, 1, 3, 6, 7, 2, 1, 3, 8, 6, 2, 1, 3, 6, 7, 1, 1, 3, 9, 7, 1, 1, 3, 6, 7, 1, 1, 3 # length +% 8, 24, 831, 9, 10, 26, 5, 5, 5, 11, 14, 4, 1, 3, 16, 14, 4, 1, 3, 16, 14, 2, 1, 3, 27, 12, 2, 1, 3, 12, 7, 2, 1, 3, 10, 7, 2, 1, 3, 8, 7, 2, 1, 3, 9, 6, 2, 1, 3, 10, 6, 2, 1, 3, 8, 7, 2, 1, 3, 9, 7, 2, 1, 3, 6, 7, 2, 1, 3, 8, 6, 2, 1, 3, 6, 7, 1, 1, 3, 9, 7, 1, 1, 3, 6, 7, 1, 1, 3 # length [ "bam", "bam_drop_file", "create procedure bam.bam_drop_file(file_id bigint, dbschema smallint) external name bam.bam_drop_file;", "bam", "MAL", "Procedure", true, false, false, "file_id", "bigint", 64, 0, "in", "dbschema", "smallint", 16, 0, "in", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ] [ "bam", "bam_export", "create procedure bam.bam_export(output_path string) external name bam.bam_export;", "bam", "MAL", "Procedure", true, false, false, "output_path", "clob", 0, 0, "in", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ] [ "bam", "bam_flag", "create function bam.bam_flag(flag smallint, name string) returns boolean external name bam.bam_flag;", "bam", "MAL", "Scalar function", false, false, false, "result", "boolean", 1, 0, "out", "flag", "smallint", 16, 0, "in", "name", "clob", 0, 0, "in", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ] _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
