Changeset: 710a95d19af2 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/710a95d19af2
Modified Files:
clients/Tests/MAL-signatures.test
Branch: default
Log Message:
Merge with Jan2022 branch.
diffs (57 lines):
diff --git a/clients/Tests/MAL-signatures.test
b/clients/Tests/MAL-signatures.test
--- a/clients/Tests/MAL-signatures.test
+++ b/clients/Tests/MAL-signatures.test
@@ -32089,12 +32089,12 @@ SQLsum;
return the sum of groups
batsql
sum
-pattern batsql.sum(X_0:bat[:int], X_1:any, X_2:any, X_3:int, X_4:any,
X_5:any):bat[:lng]
+pattern batsql.sum(X_0:bat[:int], X_1:any, X_2:any, X_3:int, X_4:any,
X_5:any):bat[:int]
SQLsum;
return the sum of groups
batsql
sum
-pattern batsql.sum(X_0:bat[:int], X_1:any, X_2:any, X_3:int, X_4:any,
X_5:any):bat[:int]
+pattern batsql.sum(X_0:bat[:int], X_1:any, X_2:any, X_3:int, X_4:any,
X_5:any):bat[:lng]
SQLsum;
return the sum of groups
batsql
diff --git a/tools/mserver/shutdowntest.c b/tools/mserver/shutdowntest.c
--- a/tools/mserver/shutdowntest.c
+++ b/tools/mserver/shutdowntest.c
@@ -271,6 +271,11 @@ static str monetdb_initialize(void) {
{
Client c = (Client) monetdb_connect();
+ if (!c) {
+ printf("Failed to initialize client\n");
+ retval = GDKstrdup("Failed to initialize client\n");
+ goto cleanup;
+ }
char* query = "SELECT * FROM tables;";
retval = monetdb_query(c, query);
monetdb_disconnect(c);
@@ -309,6 +314,11 @@ int main(int argc, char **argv) {
return -1;
}
c = (Client) monetdb_connect();
+ if (!c) {
+ printf("Failed to initialize client\n");
+ monetdb_shutdown();
+ return -1;
+ }
monetdb_query(c, "CREATE TABLE temporary_table(i INTEGER);");
monetdb_query(c, "INSERT INTO temporary_table VALUES (3), (4);");
monetdb_disconnect(c);
@@ -323,6 +333,11 @@ int main(int argc, char **argv) {
}
// printf("Successfully restarted MonetDB.\n");
c = (Client) monetdb_connect();
+ if (!c) {
+ printf("Failed to initialize client\n");
+ monetdb_shutdown();
+ return -1;
+ }
monetdb_query(c, "SELECT * FROM temporary_table;");
monetdb_query(c, "DROP TABLE temporary_table;");
monetdb_query(c, "CREATE TABLE temporary_table(i INTEGER);");
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
