[Monetdb-developers] [Monetdb-pf-checkins] pathfinder/modules/pftijah pftijah.mx, , 1.200, 1.201

Stefan Manegold Stefan.Manegold at cwi.nl
Mon Feb 2 09:22:51 CET 2009


On Mon, Feb 02, 2009 at 08:05:07AM +0000, Jan Flokstra wrote:
> Update of /cvsroot/monetdb/pathfinder/modules/pftijah
> In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv17111
> 
> Modified Files:
> 	pftijah.mx 
> Log Message:
> - Modify Hennings memory fix of yesterday eveening. This causes all old
>   pftijah testsets to fail. Henning will propagate this on to Stable.

In case you are not able to have a release branch next to the development
trunk (I currently handle 4 branches in parallel, each with 6 different
configurations), you might want to consider the following to still follow
our rule that bug fixes (that (also) apply to the release branch) are
supposed to be checked in to the release branch, only, e.g., by

	[in your checkout of the development trunk]
	[edit your source file]
	[check whether everithing compiles and works correctly]

	cvs diff <file> [to check your changes wrt. the dev. trunk]
	cvs up -r<latest release branch name> <file>
	cvs diff <file> [to check your changes wrt. the release branch]
	[! check whether your fix indeed also fits for the release branch;
	   in particular, check that there are no conflicts!               !]
	cvs ci -m'<msg>' <file>
	cvs up -A <file>

(While this is IMHO not too difficult, having a separate release branch
checkout is prefered, ans it allows for testing fixes prior to checking them
in ...)

Stefan
	
> U pftijah.mx
> Index: pftijah.mx
> ===================================================================
> RCS file: /cvsroot/monetdb/pathfinder/modules/pftijah/pftijah.mx,v
> retrieving revision 1.200
> retrieving revision 1.201
> diff -u -d -r1.200 -r1.201
> --- pftijah.mx	1 Feb 2009 17:12:17 -0000	1.200
> +++ pftijah.mx	2 Feb 2009 08:05:05 -0000	1.201
> @@ -4156,7 +4156,8 @@
>              GDKerror("CMDtijah_query: execute MIL failed.\n");
>  	    return GDK_FAIL;
>  	}
> -	GDKfree(mil);
> +	if ( newversion )
> +		GDKfree(mil);
>  	if (TDEBUG(2)) stream_printf(GDKout,"# CMDtijah_query: finish MIL script.\n");
>  	lng time_end = GDKusec();
>  
> 
> 
> ------------------------------------------------------------------------------
> This SF.net email is sponsored by:
> SourcForge Community
> SourceForge wants to tell your story.
> http://p.sf.net/sfu/sf-spreadtheword
> _______________________________________________
> Monetdb-pf-checkins mailing list
> Monetdb-pf-checkins at lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
> 

-- 
| Dr. Stefan Manegold | mailto:Stefan.Manegold at cwi.nl |
| CWI,  P.O.Box 94079 | http://www.cwi.nl/~manegold/  |
| 1090 GB Amsterdam   | Tel.: +31 (20) 592-4212       |
| The Netherlands     | Fax : +31 (20) 592-4312       |




More information about the developers-list mailing list