MonetDB: default - Merge with Aug2011 branch.

[Stefan Manegold]

Changeset: 8595115d36a4 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8595115d36a4
Modified Files:
        
Branch: default
Log Message:

Merge with Aug2011 branch.


diffs (31 lines):

diff --git a/sql/backends/monet5/datacell/datacell.c 
b/sql/backends/monet5/datacell/datacell.c
--- a/sql/backends/monet5/datacell/datacell.c
+++ b/sql/backends/monet5/datacell/datacell.c
@@ -124,8 +124,7 @@
        return DCreceptorNew(ret,tbl,host,port);
 }
 
-#if 0
-static str
+str
 DCemitter(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
 {
        int *ret = (int *) getArgReference(stk,pci,0);
@@ -137,7 +136,6 @@
                BSKTregister(cntxt,mb,stk,pci);
        return DCemitterNew(ret,tbl,host,port);
 }
-#endif
 
 str
 DCregister(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
diff --git a/sql/backends/monet5/datacell/datacell.h 
b/sql/backends/monet5/datacell/datacell.h
--- a/sql/backends/monet5/datacell/datacell.h
+++ b/sql/backends/monet5/datacell/datacell.h
@@ -62,5 +62,6 @@
 datacell_export str DCresumeScheduler(Client cntxt, MalBlkPtr mb, MalStkPtr 
stk, InstrPtr pci);
 datacell_export str DCpostlude(Client cntxt, MalBlkPtr mb, MalStkPtr stk, 
InstrPtr pci);
 
+datacell_export str DCemitter(Client cntxt, MalBlkPtr mb, MalStkPtr stk, 
InstrPtr pci);
 
 #endif
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list