MonetDB: Aug2011 - fixed `make dist`: there is no "rdf.c"

2011-08-02 Thread Stefan Manegold
Changeset: 7e3655f7ef94 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7e3655f7ef94 Modified Files: monetdb5/extras/rdf/Makefile.ag Branch: Aug2011 Log Message: fixed `make dist`: there is no "rdf.c" (rdf.mx only contained a @h section) diffs (11 lines): diff --gi

MonetDB: default - to print wrd, we use SSZFMT, not BUNFMT

2011-08-02 Thread Stefan Manegold
Changeset: 76365cad19fe for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=76365cad19fe Modified Files: monetdb5/optimizer/opt_partition.mx Branch: default Log Message: to print wrd, we use SSZFMT, not BUNFMT diffs (12 lines): diff --git a/monetdb5/optimizer/opt_parti

MonetDB: default - Merge with Aug2011 branch.

2011-08-02 Thread Stefan Manegold
Changeset: 56ac5087c846 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=56ac5087c846 Modified Files: monetdb5/mal/mal.c monetdb5/mal/mal_linker.c Branch: default Log Message: Merge with Aug2011 branch. diffs (61 lines): diff --git a/de-bootstrap b/de-bootst

MonetDB: Aug2011 - make sure that defines to prevent double incl...

2011-08-02 Thread Stefan Manegold
Changeset: c563b848bf7b for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c563b848bf7b Modified Files: monetdb5/mal/mal_linker.h monetdb5/mal/mal_xml.h Branch: Aug2011 Log Message: make sure that defines to prevent double inclusion make sense diffs (29 lines):

MonetDB: Aug2011 - fixed compilation:

2011-08-02 Thread Stefan Manegold
Changeset: 315e233ed147 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=315e233ed147 Modified Files: monetdb5/mal/mal.c Branch: Aug2011 Log Message: fixed compilation: After changeset dc37ce565cf2 moved the include of mal_module.h from mal_linker.h to mal_linker.c, c

MonetDB: Aug2011 - Make sure the purge extension is enabled when...

2011-08-02 Thread Sjoerd Mullender
Changeset: 60a7e5b5a734 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=60a7e5b5a734 Modified Files: de-bootstrap Branch: Aug2011 Log Message: Make sure the purge extension is enabled when calling hg purge. diffs (9 lines): diff --git a/de-bootstrap b/de-bootstrap

MonetDB: Aug2011 - Move #include to C file.

2011-08-02 Thread Sjoerd Mullender
Changeset: dc37ce565cf2 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=dc37ce565cf2 Modified Files: monetdb5/mal/mal_linker.c monetdb5/mal/mal_linker.h Branch: Aug2011 Log Message: Move #include to C file. This may solve the compilation issue that mal_module.

MonetDB: headless - VALformat expects a ValPtr, not a pointer to...

2011-08-02 Thread Sjoerd Mullender
Changeset: b2d4d9355641 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b2d4d9355641 Modified Files: monetdb5/mal/mal_listing.c Branch: headless Log Message: VALformat expects a ValPtr, not a pointer to the value. diffs (12 lines): diff --git a/monetdb5/mal/mal_lis

MonetDB: sciql - Merge with default branch.

2011-08-02 Thread Stefan Manegold
Changeset: 976c2bee6422 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=976c2bee6422 Modified Files: sql/backends/monet5/vaults/mseed.c Branch: sciql Log Message: Merge with default branch. diffs (truncated from 1427 to 300 lines): diff --git a/clients/odbc/driver/

MonetDB: default - make sure that monetdb_config.h is first incl...

2011-08-02 Thread Stefan Manegold
Changeset: c8101c3d8ab7 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c8101c3d8ab7 Modified Files: sql/backends/monet5/LSST/lsst.c sql/backends/monet5/LSST/lsst.h sql/backends/monet5/vaults/mseed.c sql/backends/monet5/vaults/mseed.h Branch: de

MonetDB: default - Merge with Aug2011 branch.

2011-08-02 Thread Stefan Manegold
Changeset: 7d0bd3c191aa for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7d0bd3c191aa Modified Files: sql/backends/monet5/datacell/petrinet.c Branch: default Log Message: Merge with Aug2011 branch. diffs (278 lines): diff --git a/clients/odbc/driver/SQLBrowseConnect

MonetDB: Aug2011 - make sure that monetdb_config.h is first incl...

2011-08-02 Thread Stefan Manegold
Changeset: 1e580e3af018 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1e580e3af018 Modified Files: clients/odbc/driver/SQLBrowseConnect.c clients/odbc/driver/SQLConnect.c clients/odbc/setup/drvcfg.c clients/odbc/setup/drvcfg.h sql/back

MonetDB: headless - Off-by-one error preventing module listing i...

2011-08-02 Thread Sjoerd Mullender
Changeset: 1aa10425ac75 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1aa10425ac75 Modified Files: gdk/gdk_relop.c Branch: headless Log Message: Off-by-one error preventing module listing in Mtest from working. diffs (12 lines): diff --git a/gdk/gdk_relop.c b/gdk

MonetDB: default - Merge with Aug2011 branch.

2011-08-02 Thread Stefan Manegold
Changeset: ca802bfa5caa for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ca802bfa5caa Modified Files: monetdb5/mal/mal_authorize.c monetdb5/mal/mal_recycle.c monetdb5/mal/mal_stack.c Branch: default Log Message: Merge with Aug2011 branch. diffs (trunc

MonetDB: sciql - merged with default branch

2011-08-02 Thread Jennie Zhang
Changeset: ddeb9ffea161 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ddeb9ffea161 Modified Files: sql/backends/monet5/sql.mx Branch: sciql Log Message: merged with default branch diffs (truncated from 2341 to 300 lines): diff --git a/clients/mapiclient/mclient.c

MonetDB: sciql - merged with sciql branch

2011-08-02 Thread Jennie Zhang
Changeset: 92ff6576e062 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=92ff6576e062 Modified Files: Branch: sciql Log Message: merged with sciql branch diffs (190 lines): diff --git a/monetdb5/modules/mal/Tests/LICENSE b/monetdb5/modules/mal/Tests/LICENSE --- a/

MonetDB: sciql - deal with different dimension data types when c...

2011-08-02 Thread Jennie Zhang
Changeset: bd51d8adb278 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=bd51d8adb278 Modified Files: sql/server/rel_schema.c Branch: sciql Log Message: deal with different dimension data types when constructing sql_rel tree CHAR, VARCHAR, DATE, TIME and TIMESTAMP are

MonetDB: headless - Fixed some exports.

2011-08-02 Thread Sjoerd Mullender
Changeset: 0dbadc2df8c3 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0dbadc2df8c3 Modified Files: monetdb5/modules/kernel/algebra.c.mx monetdb5/modules/kernel/algebra.h.mx monetdb5/modules/kernel/colstr.c monetdb5/modules/kernel/colstr.h Bran

MonetDB: Aug2011 - uncrustify

2011-08-02 Thread Fabian Groffen
Changeset: 3ffa0b460401 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3ffa0b460401 Modified Files: monetdb5/mal/mal_resolve.mx Branch: Aug2011 Log Message: uncrustify diffs (truncated from 731 to 300 lines): diff --git a/monetdb5/mal/mal_resolve.mx b/monetdb5/mal

MonetDB: headless - Merge with default branch.

2011-08-02 Thread Sjoerd Mullender
Changeset: f549ea6257a2 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f549ea6257a2 Modified Files: gdk/gdk.h gdk/gdk_atoms.c gdk/gdk_cbp.c gdk/gdk_col.c gdk/gdk_colop.c gdk/gdk_qsort.c gdk/gdk_rangejoin.c gdk/gd

MonetDB: Aug2011 - chooseVictims: do not use alloca

2011-08-02 Thread Fabian Groffen
Changeset: c8e6e2e252ab for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c8e6e2e252ab Modified Files: monetdb5/mal/mal_recycle.c Branch: Aug2011 Log Message: chooseVictims: do not use alloca diffs (33 lines): diff --git a/monetdb5/mal/mal_recycle.c b/monetdb5/mal/ma

MonetDB: Aug2011 - reallocStack: disable incorrect code

2011-08-02 Thread Fabian Groffen
Changeset: 9f07efd80e52 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9f07efd80e52 Modified Files: monetdb5/mal/mal_stack.c Branch: Aug2011 Log Message: reallocStack: disable incorrect code This function can never do something useful, disable it, because the stack

MonetDB: Aug2011 - AUTHhashPassword: do not use alloca for varia...

2011-08-02 Thread Fabian Groffen
Changeset: 6717e1ca0b23 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6717e1ca0b23 Modified Files: monetdb5/mal/mal_authorize.c Branch: Aug2011 Log Message: AUTHhashPassword: do not use alloca for variable sized buffer diffs (70 lines): diff --git a/monetdb5/mal/

MonetDB: Aug2011 - sabaoth: do not use alloca

2011-08-02 Thread Fabian Groffen
Changeset: b61b98fc683d for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b61b98fc683d Modified Files: monetdb5/misc/msabaoth.c Branch: Aug2011 Log Message: sabaoth: do not use alloca diffs (232 lines): diff --git a/monetdb5/misc/msabaoth.c b/monetdb5/misc/msabaoth.c

MonetDB: default - Merge with Aug2011 branch.

2011-08-02 Thread Sjoerd Mullender
Changeset: b6fe520fc28f for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b6fe520fc28f Modified Files: Branch: default Log Message: Merge with Aug2011 branch. diffs (148 lines): diff --git a/clients/mapiclient/mclient.c b/clients/mapiclient/mclient.c --- a/clients/m

MonetDB: headless - Make compilable after recent merges.

2011-08-02 Thread Sjoerd Mullender
Changeset: 69f00b632588 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=69f00b632588 Modified Files: gdk/gdk.h gdk/gdk_col.c gdk/gdk_colop.c gdk/gdk_inspect.c monetdb5/mal/mal_box.c monetdb5/mal/mal_dataflow.c monetdb5/ma

MonetDB: default - Merge with Aug2011 branch.

2011-08-02 Thread Sjoerd Mullender
Changeset: b395d5cdaf60 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b395d5cdaf60 Modified Files: monetdb5/modules/mal/language.mx monetdb5/modules/mal/mat.mx monetdb5/modules/mal/mdb.mx monetdb5/optimizer/opt_dataflow.mx monetdb5/opt

MonetDB: Aug2011 - mapi_start_talking: avoid alloca usage

2011-08-02 Thread Fabian Groffen
Changeset: 9275caf60414 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9275caf60414 Modified Files: clients/mapilib/mapi.c Branch: Aug2011 Log Message: mapi_start_talking: avoid alloca usage Use the update functions of digests to incrementally build up the digest, i

MonetDB: Aug2011 - mclient: do not use alloca

2011-08-02 Thread Fabian Groffen
Changeset: 4200e90e1bdc for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4200e90e1bdc Modified Files: clients/mapiclient/mclient.c Branch: Aug2011 Log Message: mclient: do not use alloca Use malloc and free for variable sized allocations. diffs (41 lines): diff --g

MonetDB: Aug2011 - Fixed location of @f directives.

2011-08-02 Thread Sjoerd Mullender
Changeset: 3216d1014914 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3216d1014914 Modified Files: gdk/gdk.mx gdk/gdk_atoms.mx gdk/gdk_bat.mx gdk/gdk_batop.mx gdk/gdk_bbp.mx gdk/gdk_qsort.mx gdk/gdk_rangejoin.mx

MonetDB: Aug2011 - extended timeout for slow(er) machines

2011-08-02 Thread Stefan Manegold
Changeset: d8d1733bbb29 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d8d1733bbb29 Modified Files: sql/jdbc/tests/Tests/Test_PSlargeamount.timeout Branch: Aug2011 Log Message: extended timeout for slow(er) machines diffs (6 lines): diff --git a/sql/jdbc/tests/Tes

MonetDB: headless - Merge with default branch.

2011-08-02 Thread Stefan Manegold
Changeset: ef87243d4177 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ef87243d4177 Modified Files: monetdb5/modules/mal/Tests/inspect05.stable.out monetdb5/modules/mal/Tests/inspect05.stable.out.Windows monetdb5/modules/mal/mal_init.mal monetd

MonetDB: sciql - Merge with default branch.

2011-08-02 Thread Stefan Manegold
Changeset: e682b9e3510e for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e682b9e3510e Modified Files: monetdb5/modules/mal/mal_init.mal Branch: sciql Log Message: Merge with default branch. diffs (11 lines): diff --git a/monetdb5/optimizer/opt_support.c b/monetdb5/o

MonetDB: default - Merge with Aug2011 branch.

2011-08-02 Thread Stefan Manegold
Changeset: c5a2e62264d1 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c5a2e62264d1 Modified Files: monetdb5/modules/mal/Tests/LICENSE monetdb5/modules/mal/Tests/inspect05.stable.out monetdb5/modules/mal/Tests/inspect05.stable.out.Windows monet

MonetDB: Aug2011 - removed obsolete "partitons" optimizer and re...

2011-08-02 Thread Stefan Manegold
Changeset: 319ec437772e for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=319ec437772e Modified Files: monetdb5/modules/mal/Tests/LICENSE monetdb5/modules/mal/Tests/bpt01.mal monetdb5/modules/mal/Tests/bpt01.stable.err monetdb5/modules/mal/Tests/b

MonetDB: default - Merge with Aug2011.

2011-08-02 Thread Stefan Manegold
Changeset: df3e48a32dd3 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=df3e48a32dd3 Modified Files: monetdb5/modules/mal/Tests/inspect05.stable.out Branch: default Log Message: Merge with Aug2011. No actual changes, as lsst is available in default branch. __

MonetDB: Aug2011 - remove lsst traces as lsst has been remove fr...

2011-08-02 Thread Stefan Manegold
Changeset: 43f9118a0523 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=43f9118a0523 Modified Files: monetdb5/modules/mal/Tests/inspect05.stable.out Branch: Aug2011 Log Message: remove lsst traces as lsst has been remove from Aug2011 (only); these changes must mor be

Re: MonetDB: Aug2011 - (re-)fixed datacell compilations in Aug2011 b...

2011-08-02 Thread Fabian Groffen
On 02-08-2011 13:20:47 +0200, Stefan Manegold wrote: > REMINDER: > > PLEASE use `hg diff` to double-check your changes > *before* checking them in. > > PLEASE be very careful when resolving conflicts with > merging heads --- or BETTER: avoid the need to merge > heads by keeping your clone up-to-d

MonetDB: sciql - Merge with default branch.

2011-08-02 Thread Sjoerd Mullender
Changeset: 60b209c6d77a for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=60b209c6d77a Modified Files: Branch: sciql Log Message: Merge with default branch. diffs (179 lines): diff --git a/monetdb5/modules/mal/Tests/LICENSE b/monetdb5/modules/mal/Tests/LICENSE ---

MonetDB: default - Merge with Aug2011 branch.

2011-08-02 Thread Stefan Manegold
Changeset: aaba69b2d4c0 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=aaba69b2d4c0 Modified Files: sql/backends/monet5/datacell/actuator.c Branch: default Log Message: Merge with Aug2011 branch. (default branch already contain the compilation (re-)fix in sql/backen

MonetDB: headless - Merge with default branch.

2011-08-02 Thread Sjoerd Mullender
Changeset: d0f7c8e1270a for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d0f7c8e1270a Modified Files: gdk/gdk.h gdk/gdk_atoms.c gdk/gdk_cbp.c gdk/gdk_col.c gdk/gdk_colop.c gdk/gdk_qsort.c gdk/gdk_rangejoin.c gdk/gd

MonetDB: headless - Merge with default branch.

2011-08-02 Thread Sjoerd Mullender
Changeset: c84d718174fb for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c84d718174fb Modified Files: monetdb5/modules/mal/Tests/bpt01.mal monetdb5/modules/mal/Tests/bpt01.stable.err monetdb5/modules/mal/Tests/bpt01.stable.out monetdb5/modules/ma

MonetDB: Aug2011 - (re-)fixed datacell compilations in Aug2011 b...

2011-08-02 Thread Stefan Manegold
Changeset: c2aa8cdf246a for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c2aa8cdf246a Modified Files: sql/backends/monet5/datacell/actuator.c Branch: Aug2011 Log Message: (re-)fixed datacell compilations in Aug2011 branch, i.e., where is actually has been broken by cha

MonetDB: default - Merge with Aug2011 branch.

2011-08-02 Thread Stefan Manegold
Changeset: 7f9fe5770ffe for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7f9fe5770ffe Modified Files: monetdb5/modules/mal/Tests/inspect05.stable.out monetdb5/modules/mal/Tests/inspect05.stable.out.Windows Branch: default Log Message: Merge with Aug2011 branch.

MonetDB: Aug2011 - remove traces of removed module bpm

2011-08-02 Thread Stefan Manegold
Changeset: 7e9892add858 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7e9892add858 Modified Files: monetdb5/modules/mal/Tests/inspect05.stable.out monetdb5/modules/mal/Tests/inspect05.stable.out.Windows Branch: Aug2011 Log Message: remove traces of removed m

MonetDB: default - Merge heads

2011-08-02 Thread mk
Changeset: 6883ed41ea7c for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6883ed41ea7c Modified Files: Branch: default Log Message: Merge heads diffs (33 lines): diff --git a/monetdb5/modules/mal/Tests/LICENSE b/monetdb5/modules/mal/Tests/LICENSE --- a/monetdb5/mod

MonetDB: default - Fix compilation issue

2011-08-02 Thread mk
Changeset: 86f3baf559e9 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=86f3baf559e9 Modified Files: sql/backends/monet5/datacell/actuator.c Branch: default Log Message: Fix compilation issue diffs (14 lines): diff --git a/sql/backends/monet5/datacell/actuator.c b

MonetDB: sciql - Merge with default branch.

2011-08-02 Thread Sjoerd Mullender
Changeset: e796ae67de98 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e796ae67de98 Modified Files: monetdb5/extras/compiler/mal_compiler.mx monetdb5/extras/crackers/crackers_pq.mx monetdb5/extras/rdf/rdf.mx monetdb5/extras/sphinx/sphinx.mx

MonetDB: default - Merge with Aug2011 branch.

2011-08-02 Thread Stefan Manegold
Changeset: 068e2f7c6510 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=068e2f7c6510 Modified Files: monetdb5/modules/mal/Tests/LICENSE Branch: default Log Message: Merge with Aug2011 branch. diffs (33 lines): diff --git a/monetdb5/modules/mal/Tests/LICENSE b/mone

MonetDB: Aug2011 - remove remaining traces of removed bpm tests

2011-08-02 Thread Stefan Manegold
Changeset: 027f0f27563a for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=027f0f27563a Modified Files: monetdb5/modules/mal/Tests/LICENSE Branch: Aug2011 Log Message: remove remaining traces of removed bpm tests diffs (33 lines): diff --git a/monetdb5/modules/mal/Tes

MonetDB: default - removed remaining traces of partitons optimiz...

2011-08-02 Thread Stefan Manegold
Changeset: ec54e6068739 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ec54e6068739 Modified Files: monetdb5/modules/mal/Tests/inspect05.stable.out monetdb5/modules/mal/Tests/inspect05.stable.out.Windows monetdb5/optimizer/Tests/LICENSE Branch: default

MonetDB: default - removed "bpt" tests that require partitions o...

2011-08-02 Thread Stefan Manegold
Changeset: d34eb86293b1 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d34eb86293b1 Modified Files: monetdb5/modules/mal/Tests/LICENSE monetdb5/modules/mal/Tests/bpt01.mal monetdb5/modules/mal/Tests/bpt01.stable.err monetdb5/modules/mal/Tests/b

MonetDB: default - Merge with Aug2011 branch.

2011-08-02 Thread Sjoerd Mullender
Changeset: a00a44651f90 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a00a44651f90 Modified Files: monetdb5/extras/compiler/mal_compiler.c monetdb5/extras/compiler/mal_compiler.mx monetdb5/extras/crackers/crackers_pq.c monetdb5/extras/crackers

MonetDB: Aug2011 - Converted all non source code in all .mx file...

2011-08-02 Thread Sjoerd Mullender
Changeset: ac2447158623 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ac2447158623 Modified Files: gdk/gdk.mx gdk/gdk_atoms.mx gdk/gdk_bat.mx gdk/gdk_batop.mx gdk/gdk_bbp.mx gdk/gdk_qsort.mx gdk/gdk_rangejoin.mx

MonetDB: default - Merge heads.

2011-08-02 Thread Sjoerd Mullender
Changeset: 75299b22713b for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=75299b22713b Modified Files: monetdb5/modules/mal/mal_init.mal monetdb5/optimizer/Makefile.ag Branch: default Log Message: Merge heads. diffs (40 lines): diff --git a/monetdb5/modules/m

MonetDB: Aug2011 - Converted all remaining .mx files without mac...

2011-08-02 Thread Sjoerd Mullender
Changeset: 2f9c5a4c5414 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2f9c5a4c5414 Modified Files: monetdb5/extras/compiler/Makefile.ag monetdb5/extras/compiler/mal_compiler.c monetdb5/extras/compiler/mal_compiler.h monetdb5/extras/compiler/ma

MonetDB: default - there is no "opt_slicing" anymore ...

2011-08-02 Thread Stefan Manegold
Changeset: 23e0f2320dfd for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=23e0f2320dfd Modified Files: monetdb5/modules/mal/mal_init.mx Branch: default Log Message: there is no "opt_slicing" anymore ... it seems to have been renamed to or replaced by opt_partition by c

MonetDB: default - opt_partitions has been removed; hence we can...

2011-08-02 Thread Stefan Manegold
Changeset: bd82d4388f73 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=bd82d4388f73 Modified Files: monetdb5/modules/mal/mal_init.mx monetdb5/optimizer/Makefile.ag Branch: default Log Message: opt_partitions has been removed; hence we cannot compile or load i

MonetDB: default - Fix merge errors.

2011-08-02 Thread Sjoerd Mullender
Changeset: 81f4887cc998 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=81f4887cc998 Modified Files: monetdb5/mal/mal_interpreter.mx monetdb5/optimizer/opt_partition.mx monetdb5/scheduler/run_centipede.mx Branch: default Log Message: Fix merge errors.

MonetDB: headless - Merge with default branch.

2011-08-02 Thread Sjoerd Mullender
Changeset: 1668b00f3698 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1668b00f3698 Modified Files: configure.ag gdk/gdk.h gdk/gdk_atoms.c gdk/gdk_col.c gdk/gdk_relop.c gdk/gdk_ssort.c gdk/gdk_ssort_impl.h gdk/gd

MonetDB: default - Merge with Aug2011 branch.

2011-08-02 Thread Sjoerd Mullender
Changeset: 3cc9b8a40a08 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3cc9b8a40a08 Modified Files: configure.ag monetdb5/modules/mal/Makefile.ag monetdb5/modules/mal/bpm.mx monetdb5/modules/mal/mal_init.mx monetdb5/optimizer/opt_datafl