Changeset: 63508829a869 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/63508829a869 Branch: default Log Message:
Merge heads. diffs (74 lines): diff --git a/monetdb5/mal/Tests/All b/monetdb5/mal/Tests/All --- a/monetdb5/mal/Tests/All +++ b/monetdb5/mal/Tests/All @@ -46,7 +46,7 @@ tst045 tst046 tst047 tst048 -tst049 +HAVE_LIBPCRE?tst049 tst050 tst051 tst052 diff --git a/sql/test/BugTracker-2008/Tests/All b/sql/test/BugTracker-2008/Tests/All --- a/sql/test/BugTracker-2008/Tests/All +++ b/sql/test/BugTracker-2008/Tests/All @@ -35,7 +35,7 @@ col_from_another_inside_function_body.SF is_distinct_broken.SF-2430201 blob_insert_crash.SF-2388542 subselect_with_or.SF-2466725 -OOM_query.SF-2457195 +HAVE_LIBPCRE?OOM_query.SF-2457195 copy-format.SF-2468513 copy-count.SF-2485215 About_CHAR.SF-2075268 diff --git a/sql/test/BugTracker-2013/Tests/All b/sql/test/BugTracker-2013/Tests/All --- a/sql/test/BugTracker-2013/Tests/All +++ b/sql/test/BugTracker-2013/Tests/All @@ -40,7 +40,7 @@ sort_void_crash.Bug-3341 bogus_aggregation_casts.Bug-3342 recursion # remind us that it should work nestedcalls -like_pcre_or.Bug-3348 +HAVE_LIBPCRE?like_pcre_or.Bug-3348 duplicate_column_name.Bug-3349 binary_copy_into.Bug-3345 copy-into-compressed.Bug-3351 diff --git a/sql/test/BugTracker-2019/Tests/All b/sql/test/BugTracker-2019/Tests/All --- a/sql/test/BugTracker-2019/Tests/All +++ b/sql/test/BugTracker-2019/Tests/All @@ -6,7 +6,7 @@ subselect-contradiction.Bug-6683 insert-replica-table.Bug-6684 subselect-count.Bug-6686 subselect.Bug-6688 -duplicates-not-eliminated-long-CASE-stmt.Bug-6697 +HAVE_LIBPCRE?duplicates-not-eliminated-long-CASE-stmt.Bug-6697 subselect.Bug-6700 alter_table_set_schema.Bug-6701 crash-in-rel_dependencies.Bug-6703 diff --git a/sql/test/Tests/All b/sql/test/Tests/All --- a/sql/test/Tests/All +++ b/sql/test/Tests/All @@ -55,7 +55,7 @@ joins default HAVE_GEOM?keys -like_tests +HAVE_LIBPCRE?like_tests more_like_tests news diff --git a/sql/test/VOC/Tests/All b/sql/test/VOC/Tests/All --- a/sql/test/VOC/Tests/All +++ b/sql/test/VOC/Tests/All @@ -1,8 +1,8 @@ VOCcreate_user USER=voc&PASSWD=voc?VOCschema USER=voc&PASSWD=voc?VOCinsert -USER=voc&PASSWD=voc?VOCquery -USER=voc&PASSWD=voc?VOCmanual_examples +USER=voc&PASSWD=voc&HAVE_LIBPCRE?VOCquery +USER=voc&PASSWD=voc&HAVE_LIBPCRE?VOCmanual_examples USER=voc&PASSWD=voc?VOCdrop VOCdrop_user median.Bug-3096 _______________________________________________ checkin-list mailing list -- checkin-list@monetdb.org To unsubscribe send an email to checkin-list-le...@monetdb.org
