MonetDB: default - Merge with Dec2016 branch.

Changeset: 6d6c9440ee0f for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6d6c9440ee0f Modified Files: monetdb5/modules/atoms/json.c Branch: default Log Message: Merge with Dec2016 branch. diffs (12 lines): diff --git a/monetdb5/modules/atoms/json.c b/monetdb5/module

MonetDB: Dec2016 - Merge with Jun2016 branch.

Changeset: 99aabb9cfcc6 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=99aabb9cfcc6 Modified Files: monetdb5/modules/atoms/json.c Branch: Dec2016 Log Message: Merge with Jun2016 branch. diffs (12 lines): diff --git a/monetdb5/modules/atoms/json.c b/monetdb5/module

MonetDB: Jun2016 - Typo.

Changeset: b93f4c5c13e2 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b93f4c5c13e2 Modified Files: monetdb5/modules/atoms/json.c Branch: Jun2016 Log Message: Typo. diffs (12 lines): diff --git a/monetdb5/modules/atoms/json.c b/monetdb5/modules/atoms/json.c --- a/

MonetDB: default - Merge with Dec2016 branch.

Changeset: 8a709fd58db8 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8a709fd58db8 Modified Files: gdk/gdk_batop.c Branch: default Log Message: Merge with Dec2016 branch. diffs (45 lines): diff --git a/gdk/gdk_batop.c b/gdk/gdk_batop.c --- a/gdk/gdk_batop.c +++ b

MonetDB: Dec2016 - Move destruction of unloaded hash forward.

Changeset: 4e773318a3bc for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4e773318a3bc Modified Files: gdk/gdk_batop.c Branch: Dec2016 Log Message: Move destruction of unloaded hash forward. diffs (27 lines): diff --git a/gdk/gdk_batop.c b/gdk/gdk_batop.c --- a/gdk/g

MonetDB: Jun2016 - Ancient typo.

Changeset: 2c74d71e840e for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2c74d71e840e Modified Files: gdk/gdk_batop.c Branch: Jun2016 Log Message: Ancient typo. diffs (21 lines): diff --git a/gdk/gdk_batop.c b/gdk/gdk_batop.c --- a/gdk/gdk_batop.c +++ b/gdk/gdk_bato

MonetDB: Dec2016 - Merge with Jun2016 branch.

Changeset: ce667e504110 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ce667e504110 Modified Files: gdk/gdk_batop.c Branch: Dec2016 Log Message: Merge with Jun2016 branch. diffs (21 lines): diff --git a/gdk/gdk_batop.c b/gdk/gdk_batop.c --- a/gdk/gdk_batop.c +++ b

MonetDB: Jun2016 - Don't remove hash if we need it for keeping v...

Changeset: 6a8d0c1a169d for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6a8d0c1a169d Modified Files: gdk/gdk_batop.c Branch: Jun2016 Log Message: Don't remove hash if we need it for keeping values unique. diffs (17 lines): diff --git a/gdk/gdk_batop.c b/gdk/gdk_bat