MonetDB: default - reverting merge table changes

2011-01-31 Thread Niels Nes
Changeset: fd27f2925e38 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fd27f2925e38 Modified Files: clients/mapiclient/dump.c clients/odbc/driver/SQLForeignKeys.c clients/odbc/driver/SQLPrimaryKeys.c clients/odbc/driver/SQLSpecialColumns.c

MonetDB: default - fix debug message

2011-01-31 Thread Niels Nes
Changeset: e9f38859e315 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e9f38859e315 Modified Files: gdk/gdk_heap.mx Branch: default Log Message: fix debug message diffs (12 lines): diff --git a/gdk/gdk_heap.mx b/gdk/gdk_heap.mx --- a/gdk/gdk_heap.mx +++ b/gdk/gdk_

MonetDB: default - merging

2011-01-31 Thread Niels Nes
Changeset: e85c9dfc09ef for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e85c9dfc09ef Modified Files: Branch: default Log Message: merging diffs (199 lines): diff --git a/buildtools/Mx/Code.c b/buildtools/Mx/Code.c --- a/buildtools/Mx/Code.c +++ b/buildtools/Mx/Cod

MonetDB: default - merging

2011-01-31 Thread Niels Nes
Changeset: e604d5340ca2 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e604d5340ca2 Modified Files: clients/mapiclient/dump.c clients/odbc/driver/SQLForeignKeys.c clients/odbc/driver/SQLPrimaryKeys.c clients/odbc/driver/SQLSpecialColumns.c

MonetDB: default - merging

2011-01-31 Thread Niels Nes
Changeset: 93e8056567be for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=93e8056567be Modified Files: java/src/nl/cwi/monetdb/jdbc/MonetDatabaseMetaData.java Branch: default Log Message: merging diffs (86 lines): diff --git a/java/src/nl/cwi/monetdb/jdbc/MonetDataba

MonetDB: default - added first steps of merge tables on sql level

2011-01-31 Thread Niels Nes
Changeset: 1c47be926f62 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1c47be926f62 Modified Files: sql/backends/monet5/sql.mx sql/common/sql_types.c sql/include/sql_catalog.h sql/server/rel_bin.c sql/server/rel_dump.c sql/serve

MonetDB: default - added debug output (on ALLOCDEBUG)

2011-01-31 Thread Niels Nes
Changeset: 7b053a18ef98 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7b053a18ef98 Modified Files: gdk/gdk_heap.mx Branch: default Log Message: added debug output (on ALLOCDEBUG) optimize which heap is reused (ie equal or larger (but smallest possible)). diffs (12

MonetDB: default - merging

2011-01-31 Thread Niels Nes
Changeset: ee1466926f3f for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ee1466926f3f Modified Files: monetdb5/optimizer/opt_support.mx Branch: default Log Message: merging diffs (13 lines): diff --git a/monetdb5/optimizer/opt_support.mx b/monetdb5/optimizer/opt_su

MonetDB: default - Merged from Mar2011

2011-01-31 Thread Fabian Groffen
Changeset: 5606a62547ff for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5606a62547ff Modified Files: tools/merovingian/daemon/Makefile.ag tools/merovingian/daemon/controlrunner.c Branch: default Log Message: Merged from Mar2011 ___

MonetDB: Mar2011 - merovingian: remove incomplete peering

2011-01-31 Thread Fabian Groffen
Changeset: a9183694fb4f for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a9183694fb4f Modified Files: tools/merovingian/daemon/Makefile.ag tools/merovingian/daemon/controlrunner.c tools/merovingian/daemon/peering.c tools/merovingian/daemon/peerin

MonetDB: default - Merged from Mar2011

2011-01-31 Thread Fabian Groffen
Changeset: 645115158792 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=645115158792 Modified Files: tools/merovingian/daemon/Makefile.ag tools/merovingian/daemon/client.c tools/merovingian/daemon/discoveryrunner.c Branch: default Log Message: Merged f

MonetDB: Mar2011 - merovingian: remove multplex-funnel

2011-01-31 Thread Fabian Groffen
Changeset: daaa959d5a89 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=daaa959d5a89 Modified Files: tools/merovingian/daemon/Makefile.ag tools/merovingian/daemon/client.c tools/merovingian/daemon/discoveryrunner.c tools/merovingian/daemon/multi

MonetDB: Mar2011 - Cleanup.

2011-01-31 Thread Sjoerd Mullender
Changeset: 860f97a0728f for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=860f97a0728f Modified Files: buildtools/Mx/Code.c buildtools/Mx/Def.c buildtools/Mx/Form.c buildtools/Mx/Mx.c buildtools/Mx/Mx.h buildtools/autogen/autogen/a

MonetDB: default - Merge with Mar2011 branch.

2011-01-31 Thread Sjoerd Mullender
Changeset: 40cbca3cb16f for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=40cbca3cb16f Modified Files: Branch: default Log Message: Merge with Mar2011 branch. diffs (199 lines): diff --git a/buildtools/Mx/Code.c b/buildtools/Mx/Code.c --- a/buildtools/Mx/Code.c +++

MonetDB: Mar2011 - Copy/paste error.

2011-01-31 Thread Sjoerd Mullender
Changeset: 6fb99e77c3c9 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6fb99e77c3c9 Modified Files: MonetDB.spec Branch: Mar2011 Log Message: Copy/paste error. diffs (14 lines): diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -765

MonetDB: default - Merge with Mar2011 branch.

2011-01-31 Thread Sjoerd Mullender
Changeset: d80a1844bc98 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d80a1844bc98 Modified Files: Branch: default Log Message: Merge with Mar2011 branch. diffs (14 lines): diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -765,8

MonetDB: default - Created upgradepath so that we can later upgr...

2011-01-31 Thread Sjoerd Mullender
Changeset: 3dc7b6687e45 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3dc7b6687e45 Modified Files: MonetDB.spec NT/installer32/MonetDB4-XQuery-Installer.vdproj NT/installer64/MonetDB4-XQuery-Installer.vdproj NT/monetdb_config.h.in clie

MonetDB: Mar2011 - Step one towards a new stable branch "Mar2011".

2011-01-31 Thread Sjoerd Mullender
Changeset: a28b1ca0f43c for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a28b1ca0f43c Modified Files: NT/installer32/MonetDB-ODBC-Installer.vdproj NT/installer32/MonetDB4-XQuery-Installer.vdproj NT/installer32/MonetDB5-Geom-Module.vdproj NT/insta

MonetDB: default - Step two towards a new stable branch "Mar2011".

2011-01-31 Thread Sjoerd Mullender
Changeset: 7f6fd132b49a for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7f6fd132b49a Modified Files: NT/installer32/MonetDB-ODBC-Installer.vdproj NT/installer32/MonetDB4-XQuery-Installer.vdproj NT/installer32/MonetDB5-Geom-Module.vdproj NT/insta

MonetDB: default - Added tag Mar2011_root for changeset 3dc7b668...

2011-01-31 Thread Sjoerd Mullender
Changeset: 3ad646585994 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3ad646585994 Modified Files: .hgtags Branch: default Log Message: Added tag Mar2011_root for changeset 3dc7b6687e45 diffs (8 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @

MonetDB: default - Updated vertoo patterns.

2011-01-31 Thread Sjoerd Mullender
Changeset: d610ee7cc444 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d610ee7cc444 Modified Files: vertoo.config Branch: default Log Message: Updated vertoo patterns. diffs (81 lines): diff --git a/vertoo.config b/vertoo.config --- a/vertoo.config +++ b/vertoo.co