MonetDB: context - merged with default

[Niels Nes]

Changeset: 5eab2eeef987 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5eab2eeef987
Modified Files:
        sql/backends/monet5/sql.c
        sql/backends/monet5/sql_scenario.c
        sql/server/sql_qc.c
        sql/server/sql_qc.h
Branch: context
Log Message:

merged with default


diffs (44 lines):

diff --git a/sql/backends/monet5/sql.c b/sql/backends/monet5/sql.c
--- a/sql/backends/monet5/sql.c
+++ b/sql/backends/monet5/sql.c
@@ -775,12 +775,12 @@ mvc_logfile(Client cntxt, MalBlkPtr mb, 
 str
 mvc_next_value(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
 {
+       backend *be = NULL;
        str msg;
        sql_schema *s;
        lng *res = getArgReference_lng(stk, pci, 0);
        const char *sname = *getArgReference_str(stk, pci, 1);
        const char *seqname = *getArgReference_str(stk, pci, 2);
-       backend *be;
 
        (void)mb;
        if ((msg = getBackendContext(cntxt, &be)) != NULL)
@@ -2017,7 +2017,7 @@ mvc_result_set_wrap( Client cntxt, MalBl
        int *digits, *scaledigits;
        oid o = 0;
        BATiter itertbl,iteratr,itertpe;
-       backend *be;
+       backend *be = NULL;
        BAT *b, *tbl, *atr, *tpe,*len,*scale;
 
        if ((msg = getBackendContext(cntxt, &be)) != NULL)
@@ -2233,7 +2233,7 @@ mvc_row_result_wrap( Client cntxt, MalBl
        int *digits, *scaledigits;
        oid o = 0;
        BATiter itertbl,iteratr,itertpe;
-       backend *be;
+       backend *be = NULL;
        ptr v;
        int mtype;
        BAT  *tbl, *atr, *tpe,*len,*scale;
@@ -2419,7 +2419,7 @@ mvc_table_result_wrap(Client cntxt, MalB
 {
        str res = MAL_SUCCEED;
        BAT *order;
-       backend *be;
+       backend *be = NULL;
        str msg;
        int *res_id;
        int nr_cols;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list