MonetDB: default - Merge with Aug2011 branch.

[Stefan Manegold]

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

Merge with Aug2011 branch.


diffs (12 lines):

diff --git a/sql/backends/monet5/vaults/mseed.c 
b/sql/backends/monet5/vaults/mseed.c
--- a/sql/backends/monet5/vaults/mseed.c
+++ b/sql/backends/monet5/vaults/mseed.c
@@ -284,7 +284,7 @@
        /* Make sure everything is cleaned up */
        ms_readmsr (&msr, NULL, 0, NULL, NULL, 0, 0, 0);
        if ( retcode != MS_ENDOFFILE )
-               throw(MAL, "mseed.load", "Cannot read %s: %s\n", *targetfile, 
ms_errorstr(retcode));
+               throw(MAL, "mseed.load", "Cannot read %s: %s\n", targetfile, 
ms_errorstr(retcode));
        return msg;
 }
 
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list