MonetDB: default - Merge with Jan2014 branch.

[Sjoerd Mullender]

Changeset: 5d22d08e9144 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5d22d08e9144
Modified Files:
        monetdb5/modules/mal/remote.c
        monetdb5/optimizer/opt_macro.c
        sql/backends/monet5/sql.c
Branch: default
Log Message:

Merge with Jan2014 branch.


diffs (43 lines):

diff --git a/monetdb5/modules/mal/remote.c b/monetdb5/modules/mal/remote.c
--- a/monetdb5/modules/mal/remote.c
+++ b/monetdb5/modules/mal/remote.c
@@ -196,6 +196,7 @@ str RMTconnectScen(
        }
 
        if (mapi_reconnect(m) != MOK) {
+               mapi_disconnect(m);
                MT_lock_unset(&mal_remoteLock, "remote.connect");
                throw(IO, "remote.connect", "unable to connect to '%s': %s",
                                *ouri, mapi_error_str(m));
diff --git a/monetdb5/optimizer/opt_macro.c b/monetdb5/optimizer/opt_macro.c
--- a/monetdb5/optimizer/opt_macro.c
+++ b/monetdb5/optimizer/opt_macro.c
@@ -356,7 +356,7 @@ replaceMALblock(MalBlkPtr mb, int pc, Ma
        for (i = pc; i < lim; i++, k++) {
                p = getInstrPtr(mb, i);
                q = getInstrPtr(mc, k);
-               for (j = 0; j < p->argc; j++)
+               for (j = 0; j < q->argc; j++)
                        cvar[ctop++] = getArg(q, j);
                assert(ctop < mc->vtop *mc->maxarg);
 
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
@@ -1936,9 +1936,13 @@ DELTAbat(bat *result, bat *col, bat *uid
        }
 
        c = BATdescriptor(*col);
-       if ((res = BATcopy(c, TYPE_void, c->ttype, TRUE)) == NULL)
-               throw(MAL, "sql.delta", OPERATION_FAILED);
-       BBPunfix(c->batCacheid);
+       if ( c ) {
+               if ((res = BATcopy(c, TYPE_void, c->ttype, TRUE)) == NULL){
+                       BBPunfix(c->batCacheid);
+                       throw(MAL, "sql.delta", OPERATION_FAILED);
+               }
+               BBPunfix(c->batCacheid);
+       }
 
        if ((u_val = BATdescriptor(*uval)) == NULL)
                throw(MAL, "sql.delta", RUNTIME_OBJECT_MISSING);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list