Update of /cvsroot/monetdb/sql/src/backends/monet5
In directory sc8-pr-cvs16:/tmp/cvs-serv5831
Modified Files:
Tag: SQL_2-16
Makefile.ag embeddedclient.mx prog.c
Log Message:
reenabled Mbeddedsql5
Index: embeddedclient.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/embeddedclient.mx,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -u -d -r1.10 -r1.10.2.1
--- embeddedclient.mx 19 Jan 2007 14:41:54 -0000 1.10
+++ embeddedclient.mx 20 Apr 2007 11:19:41 -0000 1.10.2.1
@@ -35,24 +35,7 @@
#ifndef _EMBEDDEDCLIENT_H_
#define _EMBEDDEDCLIENT_H_
-#include "mal_config.h"
-#include "gdk.h"
-#ifdef HAVE_PTHREAD_H
-/* pthread.h on Windows includes config.h if HAVE_CONFIG_H is set */
-#undef HAVE_CONFIG_H
-#ifdef pid_t
-#undef pid_t
-#endif
-#include <sched.h>
-#include <pthread.h>
-#endif
-
#include "monet_options.h"
-#include "mal.h"
-#include "mal_session.h"
-#include "mal_import.h"
-#include "mal_client.h"
-#include "mal_function.h"
#ifdef WIN32
#ifndef LIBEMBEDDEDSQL5
@@ -73,7 +56,23 @@
@c
#include "sql_config.h"
#include "embeddedclient.h"
-#include "mserver.h"
+
+#include "gdk.h"
+#ifdef HAVE_PTHREAD_H
+/* pthread.h on Windows includes config.h if HAVE_CONFIG_H is set */
+#undef HAVE_CONFIG_H
+#ifdef pid_t
+#undef pid_t
+#endif
+#include <sched.h>
+#include <pthread.h>
+#endif
+
+#include "mal.h"
+#include "mal_session.h"
+#include "mal_import.h"
+#include "mal_client.h"
+#include "mal_function.h"
static void
Monet_init(opt *set, int setlen)
@@ -160,10 +159,6 @@
/* monet_singlethreaded = 1; */
if (embedded_set == NULL) {
int len = mo_builtin_settings(&embedded_set);
-
- 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);
}
Monet_init(embedded_set, embedded_len);
Index: prog.c
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/prog.c,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -d -r1.5 -r1.5.2.1
--- prog.c 3 Jan 2007 12:39:25 -0000 1.5
+++ prog.c 20 Apr 2007 11:19:41 -0000 1.5.2.1
@@ -16,6 +16,8 @@
* All Rights Reserved.
*/
+#include <sql_config.h>
+#include <mal_config.h>
#include <monet_options.h>
#include "embeddedclient.h"
@@ -96,7 +98,7 @@
if (!(setlen = mo_builtin_settings(&set)))
usage(prog);
- /* needed, to prevent the MonetDB/4 config file to be used */
+ /* needed, to prevent the MonetDB config file to be used */
setlen = mo_add_option(&set, setlen, opt_config, "prefix",
MONETDBPREFIX);
setlen = mo_add_option(&set, setlen, opt_config, "config",
MONETDBCONFIG);
setlen = mo_system_config(&set, setlen);
Index: Makefile.ag
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/Makefile.ag,v
retrieving revision 1.39.2.1
retrieving revision 1.39.2.2
diff -u -d -r1.39.2.1 -r1.39.2.2
--- Makefile.ag 24 Jan 2007 20:15:28 -0000 1.39.2.1
+++ Makefile.ag 20 Apr 2007 11:19:40 -0000 1.39.2.2
@@ -34,19 +34,19 @@
}
-#lib_embeddedsql5 = {
- #SOURCES = embeddedclient.mx
- #LIBS = ../../server/libsqlserver ../../storage/bat/libbatstore
../../common/libsqlcommon \
- #$(MONETDB5_MODS) -l_logger -l_bat5 -l_tablet $(MONETDB5_LIBS)
-lmal \
- #$(CLIENTS_LIBS) $(MONETDB_LIBS) -lbat -lMapi -lmutils -lstream
$(READLINE_LIBS) $(PTHREAD_LIBS)
-#}
+lib_embeddedsql5 = {
+ SOURCES = embeddedclient.mx
+ LIBS = ../../server/libsqlserver ../../storage/bat/libbatstore
../../common/libsqlcommon \
+ $(MONETDB5_MODS) -l_logger -l_bat5 -l_tablet $(MONETDB5_LIBS)
-lmal \
+ $(CLIENTS_LIBS) $(MONETDB_LIBS) -lbat -lMapi -lmutils -lstream
$(READLINE_LIBS) $(PTHREAD_LIBS)
+}
-#bin_Mbeddedsql5 = {
- #SOURCES = prog.c
- #LIBS = libembeddedsql5 ../../server/libsqlserver
../../storage/bat/libbatstore ../../common/libsqlcommon \
- #$(MONETDB5_MODS) -l_logger -l_bat5 -l_tablet $(MONETDB5_LIBS)
-lmal \
- #$(CLIENTS_LIBS) $(MONETDB_LIBS) -lbat -lMapi -lmutils -lstream
$(READLINE_LIBS) $(PTHREAD_LIBS)
-#}
+bin_Mbeddedsql5 = {
+ SOURCES = prog.c
+ LIBS = libembeddedsql5 ../../server/libsqlserver
../../storage/bat/libbatstore ../../common/libsqlcommon \
+ $(MONETDB5_MODS) -l_logger -l_bat5 -l_tablet $(MONETDB5_LIBS)
-lmal \
+ $(CLIENTS_LIBS) $(MONETDB_LIBS) -lbat -lMapi -lmutils -lstream
$(READLINE_LIBS) $(PTHREAD_LIBS)
+}
lib__sql_cache = {
DIR = libdir/MonetDB5
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
