[Monetdb-developers] [Monetdb-sql-checkins] sql/src/tools embeddedclient.mx, 1.23, 1.24 monetdb.py.i, 1.5, 1.6 prog.c, 1.17, 1.18

Jan Rittinger rittinge at in.tum.de
Fri Apr 27 14:33:23 CEST 2007


Compilation worked fine, but M4 crashes when I start with Mserver 
--dbinit="module(sql_server);" and M5 segfaults as soon as I start a 
mclient with mclient -lsql.

As I compiled the whole suite from scratch after the propagation I think 
there is some problem in the code.

On 04/27/2007 11:46 AM, Sjoerd Mullender wrote with possible deletions:
> Update of /cvsroot/monetdb/sql/src/tools
> In directory sc8-pr-cvs16:/tmp/cvs-serv3115/src/tools
> 
> Modified Files:
> 	embeddedclient.mx monetdb.py.i prog.c 
> Log Message:
> propagated changes of Thursday Apr 12 2007 - Friday Apr 27 2007
> from the SQL_2-16 branch to the development trunk
> 
> 
> Index: embeddedclient.mx
> ===================================================================
> RCS file: /cvsroot/monetdb/sql/src/tools/embeddedclient.mx,v
> retrieving revision 1.23
> retrieving revision 1.24
> diff -u -d -r1.23 -r1.24
> --- embeddedclient.mx	9 Mar 2007 14:22:32 -0000	1.23
> +++ embeddedclient.mx	27 Apr 2007 09:46:00 -0000	1.24
> @@ -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.18
> diff -u -d -r1.17 -r1.18
> --- prog.c	7 Jan 2007 10:18:04 -0000	1.17
> +++ prog.c	27 Apr 2007 09:46:00 -0000	1.18
> @@ -16,7 +16,7 @@
>   * All Rights Reserved.
>   */
>  
> -#include <sql_config.h>
> +#include <monetdb4_config.h>
>  #include <monet_options.h>
>  #include "embeddedclient.h"
>  
> @@ -101,6 +101,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;
>  
> 
> Index: monetdb.py.i
> ===================================================================
> RCS file: /cvsroot/monetdb/sql/src/tools/monetdb.py.i,v
> retrieving revision 1.5
> retrieving revision 1.6
> diff -u -d -r1.5 -r1.6
> --- monetdb.py.i	3 Jan 2007 12:39:54 -0000	1.5
> +++ monetdb.py.i	27 Apr 2007 09:46:00 -0000	1.6
> @@ -23,6 +23,8 @@
>  #undef HAVE_FSTAT
>  #endif
>  #include "Mapi.h"
> +
> +extern Mapi monetdb_sql(char *dbfarm, char *dbname);
>  %}
>  
>  extern Mapi monetdb_sql(char *dbfarm, char *dbname);
> 
> 
> -------------------------------------------------------------------------
> 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
> 

-- 
Jan Rittinger
Database Systems
Technische Universität München (Germany)
http://www-db.in.tum.de/~rittinge/




More information about the developers-list mailing list