MonetDB: default - Merge with Oct2010 branch.

[Sjoerd Mullender]

Changeset: 4769d63b0f23 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4769d63b0f23
Modified Files:
        MonetDB5/src/mal/mal_session.mx
Branch: default
Log Message:

Merge with Oct2010 branch.


diffs (39 lines):

diff -r 2d8b1b70d8de -r 4769d63b0f23 MonetDB5/src/mal/mal_session.mx
--- a/MonetDB5/src/mal/mal_session.mx   Wed Oct 06 14:00:53 2010 +0200
+++ b/MonetDB5/src/mal/mal_session.mx   Wed Oct 06 14:07:50 2010 +0200
@@ -302,6 +302,9 @@
                                fprintf(stderr, "!SABAOTHgetMyStatus: %s\n", 
err);
                                if (err != M5OutOfMemory)
                                        GDKfree(err);
+                               mnstr_printf(fout, "!internal server error, "
+                                               "please try again later\n");
+                               mnstr_flush(fout);
                                GDKfree(command);
                                return;
                        }
@@ -324,19 +327,23 @@
                /* find and reactivate client */
                c = MCfindClient(uid, lang, fin, fout); 
                if (c != NULL) {
+                       mnstr_printf(fout, "!internal server error 
(findClient), "
+                                       "please try again later\n");
+                       mnstr_flush(fout);
                        GDKfree(command);
                        return;
                }
 
                c = MCinitClient(uid, fin, fout);
                if (c == NULL) {
-                       mnstr_printf(fout, "!Out of client slots\n");
+                       mnstr_printf(fout, "!internal server error (out of 
client slots), "
+                                       "please try again later\n");
                        mnstr_flush(fout);
                        GDKfree(command);
                        return;
                }
                /* move this back !! */
-               if ( c->nspace == 0) {
+               if (c->nspace == 0) {
                        c->nspace = newModule(NULL, putName("user", 4));
                        c->nspace->outer = mal_clients[0].nspace->outer;
                }
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list