MonetDB: Jun2020 - Exit with an error code if the query in -s fa...

[Sjoerd Mullender]

Changeset: a4d51d46140c for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a4d51d46140c
Modified Files:
        clients/mapiclient/mclient.c
Branch: Jun2020
Log Message:

Exit with an error code if the query in -s fails.


diffs (33 lines):

diff --git a/clients/mapiclient/mclient.c b/clients/mapiclient/mclient.c
--- a/clients/mapiclient/mclient.c
+++ b/clients/mapiclient/mclient.c
@@ -1957,7 +1957,7 @@ format_result(Mapi mid, MapiHdl hdl, boo
        return rc;
 }
 
-static int
+static bool
 doRequest(Mapi mid, const char *buf)
 {
        MapiHdl hdl;
@@ -1974,17 +1974,17 @@ doRequest(Mapi mid, const char *buf)
                }
                mapi_explain(mid, stderr);
                errseen = true;
-               return 1;
+               return true;
        }
 
        if (mapi_needmore(hdl) == MMORE)
-               return 0;
+               return false;
 
        format_result(mid, hdl, false);
 
        if (mapi_get_active(mid) == NULL)
                mapi_close_handle(hdl);
-       return 0;
+       return errseen;
 }
 
 #define CHECK_RESULT(mid, hdl, break_or_continue, buf, fp)     \
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list