Update of /cvsroot/monetdb/sql/src/backends/monet5
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv15050
Modified Files:
merovingian.mx
Log Message:
Do not return an empty stats, such that we can give a correct error back to the
client connecting
U merovingian.mx
Index: merovingian.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/merovingian.mx,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -d -r1.66 -r1.67
--- merovingian.mx 27 Oct 2008 10:36:40 -0000 1.66
+++ merovingian.mx 28 Oct 2008 11:53:54 -0000 1.67
@@ -371,7 +371,6 @@
if (er != MAL_SUCCEED) {
err e = newErr("%s", er);
GDKfree(er);
- *stats = NULL;
return(e);
}
@@ -413,7 +412,6 @@
err e = newErr("could not retrieve uplog information: %s", er);
GDKfree(er);
SABAOTHfreeStatus(stats);
- *stats = NULL;
return(e);
}
@@ -459,7 +457,6 @@
break;
default:
SABAOTHfreeStatus(stats);
- *stats = NULL;
return(newErr("unknown state: %d",
(int)(*stats)->state));
}
@@ -472,7 +469,6 @@
snprintf(vaultkey, 511, "%s/.vaultkey", (*stats)->path);
if (stat(vaultkey, &statbuf) == -1) {
SABAOTHfreeStatus(stats);
- *stats = NULL;
return(newErr("cannot start database '%s': no .vaultkey found "
"(did you create the database with
`monetdb create %s`?)",
database, database));
@@ -482,14 +478,12 @@
* child have the same descriptor set */
if (pipe(pfdo) == -1) {
SABAOTHfreeStatus(stats);
- *stats = NULL;
return(newErr("unable to create pipe: %s", strerror(errno)));
}
if (pipe(pfde) == -1) {
close(pfdo[0]);
close(pfdo[1]);
SABAOTHfreeStatus(stats);
- *stats = NULL;
return(newErr("unable to create pipe: %s", strerror(errno)));
}
@@ -582,9 +576,8 @@
if (i >= 20) {
int state = (*stats)->state;
- /* starting failed, don't return the struct */
+ /* starting failed */
SABAOTHfreeStatus(stats);
- *stats = NULL;
switch (state) {
case SABdbRunning:
@@ -960,7 +953,7 @@
if (top == NULL) {
stream_printf(fout, "!no such database '%s',
please create it first\n", database);
} else {
- stream_printf(fout, "!internal error while
starting a new mserver\n");
+ stream_printf(fout, "!internal error while
starting mserver, please refer to the logs\n");
}
stream_flush(fout);
close_stream(fout);
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
