MonetDB: default - Merge with Aug2011 branch.

[Stefan Manegold]

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

Merge with Aug2011 branch.


diffs (23 lines):

diff --git a/monetdb5/modules/mal/pcre.mx b/monetdb5/modules/mal/pcre.mx
--- a/monetdb5/modules/mal/pcre.mx
+++ b/monetdb5/modules/mal/pcre.mx
@@ -248,7 +248,7 @@
 } RE;
 
 #ifndef HAVE_STRCASESTR
-char *
+static char *
 strcasestr (char *haystack, char *needle)
 {
        char *p, *startn = 0, *np = 0;
diff --git a/sql/backends/monet5/vaults/mseed.h 
b/sql/backends/monet5/vaults/mseed.h
--- a/sql/backends/monet5/vaults/mseed.h
+++ b/sql/backends/monet5/vaults/mseed.h
@@ -86,6 +86,7 @@
 
 vault_export str MseedImport(Client cntxt, MalBlkPtr mb, MalStkPtr stk, 
InstrPtr pci);
 vault_export str MseedLoadSQL(Client cntxt, MalBlkPtr mb, MalStkPtr stk, 
InstrPtr pci);
+vault_export str MseedLoad(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr 
pci);
 
 #define _MSEED_DEBUG_
 
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list