MonetDB: Jul2012 - Don't ignore potential error from SQLprelude().

[Sjoerd Mullender]

Changeset: de857fcfdad9 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=de857fcfdad9
Modified Files:
        sql/backends/monet5/sql_scenario.c
Branch: Jul2012
Log Message:

Don't ignore potential error from SQLprelude().
Found by coverity.


diffs (36 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
@@ -100,8 +100,8 @@ SQLsession(Client cntxt, MalBlkPtr mb, M
        str msg = MAL_SUCCEED;
 
        (void)mb;
-       if (SQLinitialized == 0 )
-               SQLprelude();
+       if (SQLinitialized == 0 && (msg = SQLprelude()) != MAL_SUCCEED)
+               return msg;
        msg = setScenario(cntxt, "sql");
        *ret = 0;
        return msg;
@@ -114,8 +114,8 @@ SQLsession2(Client cntxt, MalBlkPtr mb, 
        str msg = MAL_SUCCEED;
 
        (void)mb;
-       if (SQLinitialized == 0 )
-               SQLprelude();
+       if (SQLinitialized == 0 && (msg = SQLprelude()) != MAL_SUCCEED)
+               return msg;
        msg = setScenario(cntxt, "msql");
        *ret = 0;
        return msg;
@@ -498,8 +498,8 @@ SQLinitClient(Client c)
 #ifdef _SQL_SCENARIO_DEBUG
        mnstr_printf(GDKout, "#SQLinitClient\n");
 #endif
-       if (SQLinitialized == 0 )
-               SQLprelude();
+       if (SQLinitialized == 0 && (msg = SQLprelude()) != MAL_SUCCEED)
+               return msg;
        /*
         * Based on the initialization return value we can prepare a SQLinit
         * string with all information needed to initialize the catalog
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list