Changeset: ec50f0298d5d for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ec50f0298d5d Modified Files: sql/test/BugTracker-2015/Tests/All Branch: Jul2015 Log Message:
merged diffs (13 lines): diff --git a/sql/test/BugTracker-2015/Tests/All b/sql/test/BugTracker-2015/Tests/All --- a/sql/test/BugTracker-2015/Tests/All +++ b/sql/test/BugTracker-2015/Tests/All @@ -93,9 +93,5 @@ msqldump_generates_incorrect_syntax_ON_U import-non-ascii.Bug-3864 mserver-creates-but-not-accept-column-types-decimal19-decimal39.Bug-3863 NOT_x_LIKE-triggers-too_many_nested_operators-error.Bug-3871 -<<<<<<< /Users/jennie/monet/Jul2015/sql/test/BugTracker-2015/Tests/All foreignkey_over_schemas.Bug-3855 -======= mserver-crashes-under-specific-combination-of-JOIN-and-WHERE-conditions.Bug-3872 - ->>>>>>> /var/folders/z9/9rzbwhc55q3b9g3hwns3s6680000gn/T/All~other.NVlgGO _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
