[Monetdb-developers] [Monetdb-sql-checkins] sql/src/tools embeddedclient.mx, 1.22.2.1, 1.22.2.2 prog.c, 1.17, 1.17.2.1

Sjoerd Mullender sjoerd at acm.org
Fri Apr 20 13:59:24 CEST 2007


Waht are you doing?  You're including all the wrong config files here
(and your other checkins).  sql uses sql_config.h and not
monetdb4_config.h nor mal_config.h.  I'd say, if you need something from
those other config.h files, it needs to be added to configure.

Niels Nes wrote:
> Update of /cvsroot/monetdb/sql/src/tools
> In directory sc8-pr-cvs16:/tmp/cvs-serv14851
> 
> Modified Files:
>       Tag: SQL_2-16
> 	embeddedclient.mx prog.c 
> Log Message:
> fixing Mbeddedsql
> 
> 
> Index: embeddedclient.mx
> ===================================================================
> RCS file: /cvsroot/monetdb/sql/src/tools/embeddedclient.mx,v
> retrieving revision 1.22.2.1
> retrieving revision 1.22.2.2
> diff -u -d -r1.22.2.1 -r1.22.2.2
> --- embeddedclient.mx	8 Mar 2007 15:59:21 -0000	1.22.2.1
> +++ embeddedclient.mx	20 Apr 2007 10:34:16 -0000	1.22.2.2
> @@ -174,7 +174,7 @@
>  	out = ((stream **) arg)[1];
>  	free(arg);
>  	snprintf(buf, sizeof(buf), "client(Stream(\"" PTRFMT "\"), Stream(\"" PTRFMT "\"));", PTRFMTCAST in, PTRFMTCAST out);
> -	monet_exec("module(sql_server);mapi_register(sql_frontend());");
> +	monet_exec("module(sql_server);");
>  	monet_exec(buf);
>  	return NULL;
>  }
> 
> Index: prog.c
> ===================================================================
> RCS file: /cvsroot/monetdb/sql/src/tools/prog.c,v
> retrieving revision 1.17
> retrieving revision 1.17.2.1
> diff -u -d -r1.17 -r1.17.2.1
> --- prog.c	7 Jan 2007 10:18:04 -0000	1.17
> +++ prog.c	20 Apr 2007 10:34:18 -0000	1.17.2.1
> @@ -17,6 +17,7 @@
>   */
>  
>  #include <sql_config.h>
> +#include <monetdb4_config.h>
>  #include <monet_options.h>
>  #include "embeddedclient.h"
>  
> @@ -101,6 +102,11 @@
>  	if (!(setlen = mo_builtin_settings(&set)))
>  		usage(prog);
>  
> +	/* 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);
> +
>  	for (;;) {
>  		int option_index = 0;
>  
> 
> 
> -------------------------------------------------------------------------
> 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
> Monetdb-sql-checkins at lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins


-- 
Sjoerd Mullender

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 369 bytes
Desc: OpenPGP digital signature
URL: <http://www.monetdb.org/pipermail/developers-list/attachments/20070420/a2b61e96/attachment.sig>


More information about the developers-list mailing list