Changeset: 765205749a3e for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=765205749a3e
Modified Files:
gdk/gdk_join.c
Branch: default
Log Message:
merged with Oct2020Z
diffs (35 lines):
diff --git a/gdk/gdk_join.c b/gdk/gdk_join.c
--- a/gdk/gdk_join.c
+++ b/gdk/gdk_join.c
@@ -2572,7 +2572,7 @@ hashjoin(BAT **r1p, BAT **r2p, BAT *l, B
r->thash ? " ignoring existing hash" : "",
swapped ? " (swapped)" : "");
if (snprintf(ext, sizeof(ext), "thshjn%x",
- (unsigned) rci->s->batCacheid) >= (int)
sizeof(ext))
+ (unsigned) THRgettid()) >= (int) sizeof(ext))
goto bailout;
if ((hsh = BAThash_impl(r, rci, ext)) == NULL) {
goto bailout;
diff --git a/sql/jdbc/tests/Tests/All b/sql/jdbc/tests/Tests/All
--- a/sql/jdbc/tests/Tests/All
+++ b/sql/jdbc/tests/Tests/All
@@ -1,5 +1,4 @@
HAVE_JDBCTESTS?JDBC_API_Tester
-HAVE_JDBCTESTS?SQLcopyinto
#HAVE_JDBCTESTS?Test_Csendthread # unfortunately has runtime-dependant output
HAVE_JDBCTESTS&HAVE_HGE?Test_Int128
HAVE_JDBCCLIENT_JAR?Test_JdbcClient
diff --git a/sql/jdbc/tests/Tests/SQLcopyinto.SQL.bat
b/sql/jdbc/tests/Tests/SQLcopyinto.SQL.bat
deleted file mode 100755
--- a/sql/jdbc/tests/Tests/SQLcopyinto.SQL.bat
+++ /dev/null
@@ -1,1 +0,0 @@
-@call "%TSTSRCDIR%\Test.SQL.bat" %*
diff --git a/sql/jdbc/tests/Tests/SQLcopyinto.SQL.sh
b/sql/jdbc/tests/Tests/SQLcopyinto.SQL.sh
deleted file mode 100755
--- a/sql/jdbc/tests/Tests/SQLcopyinto.SQL.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-$TSTSRCDIR/Test.SQL.sh $*
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
