Update of /cvsroot/monetdb/sql/src/backends/monet5
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv7960
Modified Files:
merovingian.mx
Log Message:
I'm starting to loose the "thread". Don't free what we're supposed to
return.
U merovingian.mx
Index: merovingian.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/merovingian.mx,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- merovingian.mx 22 Apr 2008 20:22:15 -0000 1.41
+++ merovingian.mx 22 Apr 2008 20:32:08 -0000 1.42
@@ -553,7 +553,9 @@
if (i >= 20) {
int state = (*stats)->state;
+ /* starting failed, don't return the struct */
SABAOTHfreeStatus(stats);
+ *stats = NULL;
switch (state) {
case SABdbRunning:
@@ -608,8 +610,6 @@
"mode during startup", database);
}
- SABAOTHfreeStatus(stats);
-
/* from now on the SIGCHLD handler can find this database */
dp->started = 1;
-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference
Don't miss this year's exciting event. There's still time to save $100.
Use priority code J8TL2D2.
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
