Changeset: 5e1aa72be9d3 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5e1aa72be9d3 Modified Files: sql/test/emptydb/Tests/check.stable.out sql/test/emptydb/Tests/check.stable.out.32bit sql/test/emptydb/Tests/check.stable.out.int128 Branch: default Log Message:
Approved output after a bad merge diffs (36 lines): 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 @@ -5107,8 +5107,6 @@ drop function pcre_replace(string, strin [ "radians", "public", "EXECUTE", "monetdb", 0 ] [ "rejects", "public", "EXECUTE", "monetdb", 0 ] [ "resume", "public", "EXECUTE", "monetdb", 0 ] -[ "reverse_qual", "public", "EXECUTE", "monetdb", 0 ] -[ "reverse_seq", "public", "EXECUTE", "monetdb", 0 ] [ "right_shift", "public", "EXECUTE", "monetdb", 0 ] [ "right_shift_assign", "public", "EXECUTE", "monetdb", 0 ] [ "setmasklen", "public", "EXECUTE", "monetdb", 0 ] diff --git a/sql/test/emptydb/Tests/check.stable.out.32bit b/sql/test/emptydb/Tests/check.stable.out.32bit --- a/sql/test/emptydb/Tests/check.stable.out.32bit +++ b/sql/test/emptydb/Tests/check.stable.out.32bit @@ -5104,8 +5104,6 @@ drop function pcre_replace(string, strin [ "radians", "public", "EXECUTE", "monetdb", 0 ] [ "rejects", "public", "EXECUTE", "monetdb", 0 ] [ "resume", "public", "EXECUTE", "monetdb", 0 ] -[ "reverse_qual", "public", "EXECUTE", "monetdb", 0 ] -[ "reverse_seq", "public", "EXECUTE", "monetdb", 0 ] [ "right_shift", "public", "EXECUTE", "monetdb", 0 ] [ "right_shift_assign", "public", "EXECUTE", "monetdb", 0 ] [ "setmasklen", "public", "EXECUTE", "monetdb", 0 ] diff --git a/sql/test/emptydb/Tests/check.stable.out.int128 b/sql/test/emptydb/Tests/check.stable.out.int128 --- a/sql/test/emptydb/Tests/check.stable.out.int128 +++ b/sql/test/emptydb/Tests/check.stable.out.int128 @@ -5356,8 +5356,6 @@ drop function pcre_replace(string, strin [ "radians", "public", "EXECUTE", "monetdb", 0 ] [ "rejects", "public", "EXECUTE", "monetdb", 0 ] [ "resume", "public", "EXECUTE", "monetdb", 0 ] -[ "reverse_qual", "public", "EXECUTE", "monetdb", 0 ] -[ "reverse_seq", "public", "EXECUTE", "monetdb", 0 ] [ "right_shift", "public", "EXECUTE", "monetdb", 0 ] [ "right_shift_assign", "public", "EXECUTE", "monetdb", 0 ] [ "setmasklen", "public", "EXECUTE", "monetdb", 0 ] _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
