MonetDB: default - Merge with Oct2010 branch.

[Sjoerd Mullender]

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

Merge with Oct2010 branch.


diffs (23 lines):

diff -r 29de703edd1d -r 55a845164ef4 clients/src/mapiclient/msqldump.c
--- a/clients/src/mapiclient/msqldump.c Thu Sep 09 13:06:36 2010 +0200
+++ b/clients/src/mapiclient/msqldump.c Thu Sep 09 13:12:14 2010 +0200
@@ -232,6 +232,10 @@
        mapi_cache_limit(mid, 10000);
 
        out = file_wastream(stdout, "stdout");
+       if (out == NULL) {
+               fprintf(stderr, "failed to allocate stream\n");
+               exit(2);
+       }
        if (!quiet) {
                char buf[27];
                time_t t = time(0);
@@ -248,7 +252,7 @@
 #endif
                if ((p = strrchr(buf, '\n')) != NULL)
                        *p = 0;
-               mnstr_printf(out,"-- msqldump %s %s\n",
+               mnstr_printf(out, "-- msqldump %s %s\n",
                             functions ? "functions" : "tables", buf);
                dump_version(mid, out, "--");
        }
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list