Changeset: d77ad8d8982d for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/d77ad8d8982d
Branch: pushcands
Log Message:
Merged with default
diffs (73 lines):
diff --git a/monetdb5/mal/mal_authorize.c b/monetdb5/mal/mal_authorize.c
--- a/monetdb5/mal/mal_authorize.c
+++ b/monetdb5/mal/mal_authorize.c
@@ -541,7 +541,8 @@ AUTHaddUser(oid *uid, Client cntxt, cons
if (!GDKembedded()) {
rethrow("addUser", tmp, AUTHcypherValue(&hash, passwd));
} else {
- hash = GDKstrdup("hash");
+ if (!(hash = GDKstrdup("hash")))
+ throw(MAL, "addUser", SQLSTATE(HY013) MAL_MALLOC_FAIL);
}
/* needs force, as SQL makes a view over user */
if (BUNappend(user, username, true) != GDK_SUCCEED ||
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,6 +1,4 @@
HAVE_JDBCTESTS?JDBC_API_Tester
-#HAVE_JDBCTESTS?Test_Csendthread # unfortunately has runtime-dependant output
-#HAVE_JDBCTESTS?Test_PSlargeamount # scalabity test which is disabled by
default (it takes a long time to run and does not need to be run everytime,
only before a new release)
HAVE_JDBCCLIENT_JAR?Test_JdbcClient
# next test should be done AFTER all the other tests have completed
HAVE_JDBCCLIENT_JAR?ValidateSystemCatalogTables
diff --git a/sql/jdbc/tests/Tests/JDBC_API_Tester.SQL.py
b/sql/jdbc/tests/Tests/JDBC_API_Tester.SQL.py
--- a/sql/jdbc/tests/Tests/JDBC_API_Tester.SQL.py
+++ b/sql/jdbc/tests/Tests/JDBC_API_Tester.SQL.py
@@ -27,7 +27,3 @@ except CalledProcessError as e:
#TST=$1
#
#java ${TST} "${URL}"
-#
-##!/bin/sh
-#
-#$TSTSRCDIR/Test.SQL.sh $*
diff --git a/sql/jdbc/tests/Tests/Test.SQL.sh b/sql/jdbc/tests/Tests/Test.SQL.sh
deleted file mode 100755
--- a/sql/jdbc/tests/Tests/Test.SQL.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-URL="jdbc:monetdb://${HOST}:${MAPIPORT}/${TSTDB}?user=monetdb&password=monetdb${JDBC_EXTRA_ARGS}"
-TST=$1
-
-java ${TST} "${URL}"
diff --git a/sql/jdbc/tests/Tests/Test_Csendthread.SQL.bat
b/sql/jdbc/tests/Tests/Test_Csendthread.SQL.bat
deleted file mode 100755
--- a/sql/jdbc/tests/Tests/Test_Csendthread.SQL.bat
+++ /dev/null
@@ -1,1 +0,0 @@
-@call "%TSTSRCDIR%\Test.SQL.bat" %*
diff --git a/sql/jdbc/tests/Tests/Test_Csendthread.SQL.sh
b/sql/jdbc/tests/Tests/Test_Csendthread.SQL.sh
deleted file mode 100755
--- a/sql/jdbc/tests/Tests/Test_Csendthread.SQL.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-$TSTSRCDIR/Test.SQL.sh $*
diff --git a/sql/jdbc/tests/Tests/Test_PSlargeamount.SQL.bat
b/sql/jdbc/tests/Tests/Test_PSlargeamount.SQL.bat
deleted file mode 100755
--- a/sql/jdbc/tests/Tests/Test_PSlargeamount.SQL.bat
+++ /dev/null
@@ -1,1 +0,0 @@
-@call "%TSTSRCDIR%\Test.SQL.bat" %*
diff --git a/sql/jdbc/tests/Tests/Test_PSlargeamount.SQL.sh
b/sql/jdbc/tests/Tests/Test_PSlargeamount.SQL.sh
deleted file mode 100755
--- a/sql/jdbc/tests/Tests/Test_PSlargeamount.SQL.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-$TSTSRCDIR/Test.SQL.sh $*
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
