MonetDB: Jan2014 - merged with Feb2013

2013-12-31 Thread Niels Nes
Changeset: 18619ff27e79 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=18619ff27e79 Modified Files: monetdb5/modules/atoms/url.c Branch: Jan2014 Log Message: merged with Feb2013 diffs (66 lines): diff --git a/monetdb5/modules/atoms/url.c b/monetdb5/modules/atoms/u

MonetDB: Jan2014 - merged with Feb2013

2013-12-24 Thread Niels Nes
Changeset: 7b3467c08c99 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7b3467c08c99 Modified Files: gdk/gdk_atoms.h gdk/gdk_calc.c gdk/gdk_calc_compare.h Branch: Jan2014 Log Message: merged with Feb2013 diffs (82 lines): diff --git a/gdk/gdk_calc.c

MonetDB: Jan2014 - merged with Feb2013

2013-12-08 Thread Niels Nes
Changeset: 486ff450abac for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=486ff450abac Modified Files: monetdb5/optimizer/opt_mergetable.c Branch: Jan2014 Log Message: merged with Feb2013 diffs (92 lines): diff --git a/monetdb5/optimizer/opt_mergetable.c b/monetdb5/

MonetDB: Jan2014 - merged with Feb2013, resolved conflicts

2013-12-04 Thread Niels Nes
Changeset: 2d6a1bb0e0cb for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2d6a1bb0e0cb Added Files: sql/test/BugTracker-2013/Tests/not_null.Bug-3403.sql sql/test/BugTracker-2013/Tests/not_null.Bug-3403.stable.err sql/test/BugTracker-2013/Tests/not_null.Bu