MonetDB: Aug2011 - Merge with Apr2011 branch.

[Sjoerd Mullender]

Changeset: 76b60803f281 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=76b60803f281
Modified Files:
        clients/mapilib/mapi.c
        gdk/gdk_atoms.mx
        gdk/gdk_bat.mx
        gdk/gdk_batop.mx
        gdk/gdk_heap.c
        gdk/gdk_logger.c
        monetdb5/mal/mal_debugger.mx
        monetdb5/mal/mal_interpreter.mx
        monetdb5/modules/mal/tablet.mx
        monetdb5/optimizer/opt_inline.mx
        monetdb5/optimizer/opt_multiplex.mx
        sql/server/rel_dump.c
Branch: Aug2011
Log Message:

Merge with Apr2011 branch.


diffs (39 lines):

diff --git a/monetdb5/extras/crackers/crackers_updates.mx 
b/monetdb5/extras/crackers/crackers_updates.mx
--- a/monetdb5/extras/crackers/crackers_updates.mx
+++ b/monetdb5/extras/crackers/crackers_updates.mx
@@ -975,7 +975,7 @@
                BAT *b;
                b=BATdescriptor(CrackerIndex[i].did);
                if (b == NULL){
-                       mnstr_printf(GDKout,"\n crack print deletions", "Failed 
to access deletions.");
+                       mnstr_printf(GDKout,"\n crack print deletions: Failed 
to access deletions.");
                        return;
                }
                BATprint(b);
@@ -992,7 +992,7 @@
                BAT *b;
                b=BATdescriptor(CrackerIndex[i].iid);
                if (b == NULL){
-                       mnstr_printf(GDKout,"\n crack print insertions", 
"Failed to access insertions.");
+                       mnstr_printf(GDKout,"\n crack print insertions: Failed 
to access insertions.");
                        return;
                }
                BATprint(b);
@@ -1010,7 +1010,7 @@
         if (CrackerIndex[i].did > 0){
                 u = BATdescriptor(CrackerIndex[i].did);
                if (u == NULL){
-                       mnstr_printf(GDKout,"\n crack print deletions", "Failed 
to access deletions.");
+                       mnstr_printf(GDKout,"\n crack print deletions: Failed 
to access deletions.");
                        return;
                }
                 printf("\n pending deletions size: "BUNFMT"\n",BATcount(u));
@@ -1030,7 +1030,7 @@
        if (CrackerIndex[i].iid > 0){
                u = BATdescriptor(CrackerIndex[i].iid);
                if (u == NULL){
-                       mnstr_printf(GDKout,"\n crack print insertions", 
"Failed to access insertions.");
+                       mnstr_printf(GDKout,"\n crack print insertions: Failed 
to access insertions.");
                        return;
                }
                printf("\n pending insertions size: "BUNFMT" \n",BATcount(u));
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list