Changeset: 0935d6764f04 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/0935d6764f04
Branch: literal_features
Log Message:
merged with default
diffs (48 lines):
diff --git a/gdk/gdk_join.c b/gdk/gdk_join.c
--- a/gdk/gdk_join.c
+++ b/gdk/gdk_join.c
@@ -2881,7 +2881,7 @@ mergejoin(BAT **r1p, BAT **r2p, BAT **r3
APPEND(r2, oid_nil); \
} \
if (r3) { \
- r3->tnil = mark == bit_nil; \
+ r3->tnil |= mark == bit_nil; \
((bit *)
r3->theap->base)[r3->batCount++] = mark; \
} \
} else if (min_one) { \
@@ -3236,7 +3236,7 @@ hashjoin(BAT **r1p, BAT **r2p, BAT **r3p
APPEND(r2, oid_nil);
}
if (r3) {
- r3->tnil = mark == bit_nil;
+ r3->tnil |= mark == bit_nil;
((bit *)
r3->theap->base)[r3->batCount++] = mark;
}
} else if (min_one) {
diff --git a/sql/test/miscellaneous/Tests/simple_selects.test
b/sql/test/miscellaneous/Tests/simple_selects.test
--- a/sql/test/miscellaneous/Tests/simple_selects.test
+++ b/sql/test/miscellaneous/Tests/simple_selects.test
@@ -1116,3 +1116,8 @@ create or replace function scale_down(x
statement error 42000!DROP FUNCTION: no such function 'any' (boolean, boolean,
boolean)
drop function "any"(boolean, boolean, boolean)
+query I
+select patindex('%bc%', 'abcd')
+----
+3
+
diff --git a/sql/test/sys-schema/Tests/webExamplesStringFunctions.test
b/sql/test/sys-schema/Tests/webExamplesStringFunctions.test
--- a/sql/test/sys-schema/Tests/webExamplesStringFunctions.test
+++ b/sql/test/sys-schema/Tests/webExamplesStringFunctions.test
@@ -154,11 +154,6 @@ select octet_length(R'2€')
4
query I
-select patindex('%bc%', 'abcd')
-----
-3
-
-query I
select position('DB' IN 'MonetDB')
----
6
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
