Changeset: 12825cff6ade for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=12825cff6ade
Modified Files:
gdk/gdk_heap.mx
Branch: default
Log Message:
Merge with Apr2011 branch.
diffs (144 lines):
diff --git a/NT/monetdb_config.h.in b/NT/monetdb_config.h.in
--- a/NT/monetdb_config.h.in
+++ b/NT/monetdb_config.h.in
@@ -644,7 +644,9 @@
#define LOCALSTATEDIR PREFIX "\\var"
#define lstat stat
+#ifndef S_ISREG /* swig-generated source file doesn't include us first
*/
#define S_ISREG(mode) (((mode) & _S_IFMT) == _S_IFREG)
+#endif
/* Define to the sub-directory in which libtool stores uninstalled libraries.
*/
diff --git a/clients/mapiclient/mclient.1 b/clients/mapiclient/mclient.1
--- a/clients/mapiclient/mclient.1
+++ b/clients/mapiclient/mclient.1
@@ -1,4 +1,4 @@
-.TH MCLIENT 1 MonetDB
+.TH MCLIENT 1 "APRIL 2011" MonetDB "MonetDB Applications"
.SH NAME
mclient \- the MonetDB command-line tool
.SH SYNOPSIS
diff --git a/gdk/gdk_heap.mx b/gdk/gdk_heap.mx
--- a/gdk/gdk_heap.mx
+++ b/gdk/gdk_heap.mx
@@ -153,7 +153,7 @@
}
if (!e)
e = hc->hc;
- i = e - hc->hc;
+ i = (int) (e - hc->hc);
if (e->maxsz < *maxsz) {
/* resize file ? */
FILE *fp;
diff --git a/tools/merovingian/ChangeLog.Apr2011
b/tools/merovingian/ChangeLog.Apr2011
--- a/tools/merovingian/ChangeLog.Apr2011
+++ b/tools/merovingian/ChangeLog.Apr2011
@@ -1,3 +1,6 @@
# ChangeLog file for sql/src/backends/monet5/merovingian
# This file is updated with mchangelog
+* Mon Apr 18 2011 Fabian Groffen <[email protected]>
+- Fix monetdb return code upon failure to start/stop a database
+
diff --git a/tools/merovingian/client/monetdb.1.in
b/tools/merovingian/client/monetdb.1.in
--- a/tools/merovingian/client/monetdb.1.in
+++ b/tools/merovingian/client/monetdb.1.in
@@ -1,7 +1,7 @@
.\" Process this file with
.\" groff -man -Tascii foo.1
.\"
-.TH MONETDB 1 "FEBRUARY 2011" MonetDB "MonetDB Applications"
+.TH MONETDB 1 "APRIL 2011" MonetDB "MonetDB Applications"
.SH NAME
monetdb \- control a MonetDB Database Server instance
.SH SYNOPSIS
diff --git a/tools/merovingian/client/monetdb.c
b/tools/merovingian/client/monetdb.c
--- a/tools/merovingian/client/monetdb.c
+++ b/tools/merovingian/client/monetdb.c
@@ -543,6 +543,9 @@
command_help(2, argv);
exit(1);
}
+
+ if (state != 0)
+ exit(state);
}
/**
diff --git a/tools/merovingian/daemon/monetdbd.1.in
b/tools/merovingian/daemon/monetdbd.1.in
--- a/tools/merovingian/daemon/monetdbd.1.in
+++ b/tools/merovingian/daemon/monetdbd.1.in
@@ -1,7 +1,7 @@
.\" Process this file with
.\" groff -man -Tascii foo.1
.\"
-.TH MONETDBD 1 "APR 2011" MonetDB "MonetDB 5"
+.TH MONETDBD 1 "APRIL 2011" MonetDB "MonetDB Applications"
.SH NAME
monetdbd \- the MonetDB Database Server daemon
.SH SYNOPSIS
diff --git a/tools/mserver/mserver5.1 b/tools/mserver/mserver5.1
--- a/tools/mserver/mserver5.1
+++ b/tools/mserver/mserver5.1
@@ -1,7 +1,7 @@
.\" Process this file with
.\" groff -man -Tascii foo.1
.\"
-.TH MSERVER5 1 "FEB 2011" MonetDB "MonetDB 5"
+.TH MSERVER5 1 "APRIL 2011" MonetDB "MonetDB Applications"
.SH NAME
mserver5 \- the MonetDB server version 5
.SH DESCRIPTION
@@ -242,41 +242,6 @@
The default pipeline used in the November 2009 release.
nov2009_pipe=inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,dataflow,history,multiplex,garbageCollector
.P
-Experimental pipelines stressing various components under
-development. Do not use any of these pipelines (in production
-settings)!
-.IP "replication_pipe"
-replication_pipe=inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,dataflow,history,replication,multiplex,garbageCollector
-.IP "accumulator_pipe"
-accumulator_pipe=inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,accumulators,dataflow,history,multiplex,garbageCollector
-.IP "recycler_pipe"
-The Recycle pipeline for Skyserver.
-recycler_pipe=inline,remap,evaluate,costModel,coercions,emptySet,aliases,deadcode,constants,commonTerms,joinPath,deadcode,recycle,reduce,dataflow,history,multiplex,garbageCollector
-.IP "cracker_pipe"
-cracker_pipe=inline,remap,evaluate,costModel,coercions,emptySet,aliases,selcrack,deadcode,commonTerms,joinPath,reorder,deadcode,reduce,dataflow,history,multiplex,garbageCollector
-.IP "sidcrack_pipe"
-sidcrack_pipe=inline,remap,evaluate,costModel,coercions,emptySet,aliases,sidcrack,deadcode,commonTerms,joinPath,reorder,deadcode,reduce,dataflow,history,multiplex,garbageCollector
-.IP "datacell_pipe"
-datacell_pipe=inline,remap,evaluate,costModel,coercions,emptySet,aliases,deadcode,constants,commonTerms,joinPath,datacell,deadcode,reduce,dataflow,history,multiplex,garbageCollector
-.IP "octopus_pipe"
-The Octopus pipeline for distributed processing (Merovingian enabled
-platforms only).
-octopus_pipe=inline,remap,evaluate,costModel,coercions,emptySet,aliases,mitosis,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,octopus,reduce,dataflow,history,multiplex,garbageCollector
-.IP "tarantula_pipe"
-tarantula_pipe=inline,remap,evaluate,costModel,coercions,emptySet,aliases,mitosis,mergetable,deadcode,constants,commonTerms,joinPath,tarantula,deadcode,reduce,dataflow,history,multiplex,garbageCollector
-.IP "mapreduce_pipe"
-The MapReduce pipeline for a different flavour of distributed
-processing on Merovingian enabled platforms.
-mapreduce_pipe=inline,remap,evaluate,costModel,coercions,emptySet,aliases,mapreduce,mergetable,deadcode,commonTerms,joinPath,reorder,deadcode,reduce,dataflow,history,multiplex,garbageCollector
-.IP "datacyclotron_pipe"
-datacyclotron_pipe=inline,remap,evaluate,costModel,coercions,emptySet,aliases,datacyclotron,mergetable,deadcode,commonTerms,joinPath,reorder,deadcode,reduce,dataflow,history,replication,multiplex,garbageCollector
-.IP "derive_pipe"
-derive_pipe=inline,remap,evaluate,costModel,coercions,emptySet,aliases,mitosis,mergetable,deadcode,commonTerms,derivePath,joinPath,reorder,deadcode,reduce,dataflow,history,multiplex,garbageCollector
-.IP "dictionary_pipe"
-dictionary_pipe=inline,remap,dictionary,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,dataflow,history,multiplex,garbageCollector
-.IP "compression_pipe"
-compression_pipe=inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,dataflow,compression,dataflow,history,multiplex,garbageCollector
-.P
Debugging the optimizer pipeline The best way is to use mdb and inspect
the information gathered during the optimization phase. Several
optimizers produce more intermediate information, which may shed light
@@ -286,7 +251,7 @@
dynamically, as it is intended for internal use.
.SH "CONFIG FILE FORMAT"
-The monetdb5.conf file consists of parameters of the form
+The conf-file readable by mserver5 consists of parameters of the form
\(dq\&name=value\(dq\&.
.P
The file is line-based, each newline-terminated line represents either a
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
