MonetDB: Apr2019 - Don't overwrite msg variable.

[Pedro Ferreira]

Changeset: 2108febc96a0 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2108febc96a0
Modified Files:
        sql/backends/monet5/sql_scenario.c
Branch: Apr2019
Log Message:

Don't overwrite msg variable.


diffs (26 lines):

diff --git a/sql/backends/monet5/sql_scenario.c 
b/sql/backends/monet5/sql_scenario.c
--- a/sql/backends/monet5/sql_scenario.c
+++ b/sql/backends/monet5/sql_scenario.c
@@ -358,7 +358,7 @@ MT_Id sqllogthread, idlethread;
 static str
 SQLinit(Client c)
 {
-       char *debug_str = GDKgetenv("sql_debug"), *msg = MAL_SUCCEED;
+       char *debug_str = GDKgetenv("sql_debug"), *msg = MAL_SUCCEED, *other = 
MAL_SUCCEED;
        bool readonly = GDKgetenv_isyes("gdk_readonly");
        bool single_user = GDKgetenv_isyes("gdk_single_user");
        const char *gmt = "GMT";
@@ -569,8 +569,12 @@ SQLinit(Client c)
                sqlcleanup(m, mvc_status(m));
        }
 
-       msg = SQLresetClient(c);
+       other = SQLresetClient(c);
        MT_lock_unset(&sql_contextLock);
+       if (other && !msg) /* 'msg' variable might be set or not, as well as 
'other'. Throw the earliest one */
+               msg = other;
+       else if (other)
+               freeException(other);
        if (msg != MAL_SUCCEED)
                return msg;
 
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list