Changeset: c04decc5762a for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c04decc5762a Modified Files: monetdb5/mal/mal.c monetdb5/modules/mal/mdb.c sql/server/rel_partition.c sql/server/rel_partition.h Branch: default Log Message:
Merge with Jun2016 branch. diffs (47 lines): diff --git a/monetdb5/mal/mal.c b/monetdb5/mal/mal.c --- a/monetdb5/mal/mal.c +++ b/monetdb5/mal/mal.c @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2008-2015 MonetDB B.V. + * Copyright 1997 - July 2008 CWI, August 2008 - 2016 MonetDB B.V. */ /* (author) M. Kersten */ diff --git a/monetdb5/modules/mal/mdb.c b/monetdb5/modules/mal/mdb.c --- a/monetdb5/modules/mal/mdb.c +++ b/monetdb5/modules/mal/mdb.c @@ -296,6 +296,7 @@ MDBgetFrame(BAT *b, BAT*bn, Client cntxt BUNappend(b, getVarName(mb, i), FALSE); BUNappend(bn, buf, FALSE); GDKfree(buf); + buf = NULL; } return MAL_SUCCEED; } diff --git a/sql/server/rel_partition.c b/sql/server/rel_partition.c --- a/sql/server/rel_partition.c +++ b/sql/server/rel_partition.c @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2008-2015 MonetDB B.V. + * Copyright 1997 - July 2008 CWI, August 2008 - 2016 MonetDB B.V. */ /*#define DEBUG*/ diff --git a/sql/server/rel_partition.h b/sql/server/rel_partition.h --- a/sql/server/rel_partition.h +++ b/sql/server/rel_partition.h @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2008-2015 MonetDB B.V. + * Copyright 1997 - July 2008 CWI, August 2008 - 2016 MonetDB B.V. */ #ifndef _REL_PARTITION_H_ _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
