MonetDB: default - Merge heads.

Changeset: 5c5a96805c35 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5c5a96805c35 Modified Files: Branch: default Log Message: Merge heads. diffs (12 lines): diff -r 7d94f618011d -r 5c5a96805c35 sql/src/backends/monet5/sql.mx --- a/sql/src/backends/monet5/sql.m

MonetDB: default - Backing out Martin's change.

Changeset: 5043add27f66 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5043add27f66 Modified Files: sql/src/backends/monet5/sql.mx Branch: default Log Message: Backing out Martin's change. If there is a problem, this was not the solution. With the change, SQL testing

MonetDB: default - Merge with Jun2010 branch.

Changeset: 7d94f618011d for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7d94f618011d Modified Files: pathfinder/tests/BugTracker/Tests/All Branch: default Log Message: Merge with Jun2010 branch. diffs (76 lines): diff -r be877d766c25 -r 7d94f618011d pathfinder/test

MonetDB: Jun2010 - Added test for ancient bug 2009.

Changeset: f969c8bc9c3c for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f969c8bc9c3c Modified Files: pathfinder/tests/BugTracker/Tests/All pathfinder/tests/BugTracker/Tests/tijah-tokenize-concat.Bug-2009.stable.err pathfinder/tests/BugTracker/Tests/ti