Update of /cvsroot/monetdb/sql/src/backends/monet4
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv18742/src/backends/monet4
Modified Files:
Makefile.ag embeddedclient.mx sql_server.mx
Log Message:
propagated changes of Wednesday Oct 17 2007 - Monday Oct 22 2007
from the SQL_2-20 branch to the development trunk
Index: embeddedclient.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet4/embeddedclient.mx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- embeddedclient.mx 24 Sep 2007 08:32:55 -0000 1.2
+++ embeddedclient.mx 22 Oct 2007 10:43:08 -0000 1.3
@@ -50,12 +50,20 @@
#include <stream.h>
#include <mapilib/Mapi.h>
+#ifdef __cplusplus
+extern "C" {
+#endif
+
embeddedclient_export Mapi monetdb_sql(char *dbfarm, char *dbname);
embeddedclient_export Mapi embedded_sql(opt *set, int len);
+#ifdef __cplusplus
+}
+#endif
+
#endif /* _EMBEDDEDCLIENT_H_ */
@c
-#include "sql_config.h"
+#include <monetdb4_config.h>
#include "embeddedclient.h"
#include "gdk.h"
@@ -132,18 +140,12 @@
GDK_mem_bigsize = strtol(p, NULL, 10);
if ((p = GDKgetenv("gdk_vm_minsize")) != NULL)
GDK_vm_minsize = strtol(p, NULL, 10);
- if (GDKgetenv_isyes("gdk_embedded")) {
- GDKembedded = 1;
- }
-
if (GDKgetenv_isyes("monet_daemon"))
monet_daemon = 1;
- if (GDKgetenv_isyes("monet_embedded")) {
- monet_daemon = 1;
- GDKembedded = 1;
- }
-
+ GDKsetenv("gdk_embedded", "yes");
+ GDKsetenv("monet_embedded", "yes");
+ GDKembedded = 1;
return monet_init();
}
@@ -207,6 +209,11 @@
stream **server;
int len = mo_builtin_settings(&embedded_set);
+
+ /* needed, to prevent the MonetDB config file to be used */
+ len = mo_add_option(&embedded_set, len, opt_config, "prefix",
MONETDBPREFIX);
+ len = mo_add_option(&embedded_set, len, opt_config, "config",
MONETDBCONFIG);
+
embedded_len = mo_system_config(&embedded_set, len);
embedded_len = mo_add_option(&embedded_set, embedded_len, opt_cmdline,
"gdk_dbfarm", dbfarm);
embedded_len = mo_add_option(&embedded_set, embedded_len, opt_cmdline,
"gdk_dbname", dbname);
Index: sql_server.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet4/sql_server.mx,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -d -r1.176 -r1.177
--- sql_server.mx 10 Oct 2007 12:16:33 -0000 1.176
+++ sql_server.mx 22 Oct 2007 10:43:08 -0000 1.177
@@ -1546,7 +1546,9 @@
if (isnil(err)) {
mapi_register(fc);
- fork(sqllogmanager());
+ if (monet_environment.find("gdk_embedded") = "no") {
+ fork(sqllogmanager());
+ }
return str(nil);
} else {
printf(err);
Index: Makefile.ag
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet4/Makefile.ag,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- Makefile.ag 18 Sep 2007 09:28:56 -0000 1.36
+++ Makefile.ag 22 Oct 2007 10:43:08 -0000 1.37
@@ -17,7 +17,9 @@
MTSAFE
SWIGFLAGS = $(MONETDB_INCS) $(CLIENTS_INCS)
-INCLUDES =
+INCLUDES = ../../include ../../common ../../storage ../../server \
+ $(CLIENTS_INCS) $(MONETDB_INCS) $(MONETDB4_INCS) $(PYTHON_INCS)
+
# with gcc we could use these
#X_CFLAGS = -Wno-unused-parameter -Wno-unused-function
@@ -54,9 +56,6 @@
EXTRA_DIST = static_modules.mx mysqldump2bulkload.py
-INCLUDES = ../../include ../../common ../../storage ../../server \
- $(CLIENTS_INCS) $(MONETDB_INCS) $(MONETDB4_INCS) $(PYTHON_INCS)
-
lib__sql_server = {
DIR = libdir/MonetDB4
SOURCES = \
@@ -121,7 +120,10 @@
PREFIX =
NAME = _monetdb
SOURCES = monetdb.py.i
- LIBS = libembeddedsql $(PYTHON_LIBS) $(MONETDB_LIBS) -lmutils -lstream
$(CLIENTS_LIBS) -lMapi
+ #LIBS = libembeddedsql $(PYTHON_LIBS) $(MONETDB_LIBS) -lmutils -lstream
$(CLIENTS_LIBS) -lMapi
+ LIBS = libinitmodules STATIC_MODS @SHARED_LIBS@ lib_sql_server
$(EXTRA_LIBS) \
+ libembeddedsql \
+ $(MONETDB_LIBS) -lbat -lmutils -lstream $(MONETDB4_LIBS)
-lmonet $(CLIENTS_LIBS) -lMapi
DIR = $(prefix)/$(PYTHON_LIBDIR)
}
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
