MonetDB: default - Merging Oct2020 into default

2021-04-22 Thread Pedro Ferreira
Changeset: 358c36e2fd92 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/358c36e2fd92 Added Files: sql/test/BugTracker-2021/Tests/merge-stmt.wrong-error.Bug-7109.test Removed Files: sql/test/BugTracker-2021/Tests/merge-stmt.wrong-error.Bug-7109.sql

MonetDB: default - Merging github edited commit

2021-03-29 Thread GIT repo for MonetDB
Changeset: 68b1ce3f3df5 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/68b1ce3f3df5 Branch: default Log Message: Merging github edited commit diffs (16 lines): diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md ---

MonetDB: default - Merging with linear-hashing

2020-02-21 Thread Pedro Ferreira
Changeset: 9c2650e33793 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9c2650e33793 Added Files: clients/R/Tests/SingleServer monetdb5/optimizer/Tests/SingleServer sql/backends/monet5/UDF/capi/Tests/SingleServer

MonetDB: default - Merging default with upstream

2017-02-16 Thread Panagiotis Koutsourakis
Changeset: 8ec3b050e2e5 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8ec3b050e2e5 Modified Files: .hgtags MonetDB.spec NT/installer32/MonetDB-ODBC-Installer.vdproj NT/installer32/MonetDB5-Geom-Module.vdproj

MonetDB: default - Merging heads

2015-04-24 Thread Martin Kersten
Changeset: c47904b38e57 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c47904b38e57 Added Files: sql/backends/monet5/vaults/74_netcdf.mal sql/backends/monet5/vaults/74_netcdf.sql sql/backends/monet5/vaults/netcdf.c

MonetDB: default - merging

2014-04-16 Thread Niels Nes
Changeset: 257861aceddd for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=257861aceddd Modified Files: clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures_gsl.stable.out clients/Tests/MAL-signatures_nocfitsio.stable.out

MonetDB: default - merging

2013-06-19 Thread Niels Nes
Changeset: 81c0d61bcc04 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=81c0d61bcc04 Added Files: sql/test/BugTracker-2013/Tests/decimal-cast.Bug-3310.sql sql/test/BugTracker-2013/Tests/decimal-cast.Bug-3310.stable.err

MonetDB: default - merging

2013-04-26 Thread Niels Nes
Changeset: 210bd31dc718 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=210bd31dc718 Added Files: sql/test/BugTracker-2013/Tests/aggregates-typing-issues.Bug-3277.csv sql/test/BugTracker-2013/Tests/aggregates-typing-issues.Bug-3277.sql.in

MonetDB: default - merging

2013-04-10 Thread Niels Nes
Changeset: 09624ee9110a for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=09624ee9110a Modified Files: monetdb5/mal/mal_instruction.c monetdb5/mal/mal_instruction.h Branch: default Log Message: merging diffs (70 lines): diff --git

MonetDB: default - merging

2013-03-20 Thread Martin Kersten
Changeset: 2b38ee631449 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2b38ee631449 Modified Files: sql/test/Tests/systemfunctions.stable.out Branch: default Log Message: merging diffs (12 lines): diff --git a/sql/test/Tests/systemfunctions.stable.out

MonetDB: default - merging

2013-03-06 Thread Niels Nes
Changeset: f4c6e22445b6 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f4c6e22445b6 Added Files: sql/test/bugs/Tests/emili.sql sql/test/bugs/Tests/emili.stable.err sql/test/bugs/Tests/emili.stable.out sql/test/bugs/Tests/polymorphism.sql

MonetDB: default - merging Feb2013

2013-03-06 Thread Niels Nes
Changeset: dcdbb273cb0d for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=dcdbb273cb0d Added Files: sql/test/BugTracker-2013/Tests/select-view-view.Bug-3245.sql sql/test/BugTracker-2013/Tests/select-view-view.Bug-3245.stable.err

MonetDB: default - merging with Feb2013

2013-03-05 Thread Niels Nes
Changeset: bef940436d21 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=bef940436d21 Modified Files: sql/backends/monet5/rel_bin.c sql/server/rel_optimizer.c sql/server/rel_select.c sql/storage/bat/bat_storage.c sql/storage/store.c

MonetDB: default - merging with Feb2013

2013-03-05 Thread Niels Nes
Changeset: 43ec8198376a for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=43ec8198376a Modified Files: sql/include/sql_catalog.h sql/storage/store.c Branch: default Log Message: merging with Feb2013 diffs (232 lines): diff --git a/sql/include/sql_catalog.h

MonetDB: default - merging

2013-01-25 Thread Martin Kersten
Changeset: 8c48c8cbfb73 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8c48c8cbfb73 Modified Files: clients/Tests/exports.stable.out clients/mapiclient/tomograph.c gdk/gdk_select.c monetdb5/extras/rdf/rdf.h

MonetDB: default - merging

2012-12-12 Thread Niels Nes
Changeset: 218d31055701 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=218d31055701 Modified Files: gdk/gdk_bat.c Branch: default Log Message: merging diffs (11 lines): diff --git a/gdk/gdk_bat.c b/gdk/gdk_bat.c --- a/gdk/gdk_bat.c +++ b/gdk/gdk_bat.c @@ -3050,6

MonetDB: default - merging

2012-11-25 Thread Niels Nes
Changeset: ffc6ce2421d2 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ffc6ce2421d2 Modified Files: monetdb5/modules/mal/mat.c Branch: default Log Message: merging diffs (39 lines): diff --git a/monetdb5/modules/mal/mat.c b/monetdb5/modules/mal/mat.c ---

MonetDB: default - merging with default

2012-11-25 Thread Martin Kersten
Changeset: a3b63c3a6978 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a3b63c3a6978 Modified Files: tools/merovingian/daemon/discoveryrunner.c tools/merovingian/utils/utils.c Branch: default Log Message: merging with default diffs (31 lines): diff --git

MonetDB: default - merging

2012-11-24 Thread Niels Nes
Changeset: fd1426eab81e for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fd1426eab81e Modified Files: monetdb5/optimizer/opt_joinpath.c Branch: default Log Message: merging diffs (12 lines): diff --git a/monetdb5/optimizer/opt_joinpath.c

MonetDB: default - Merging

2012-11-14 Thread Martin Kersten
Changeset: 85ab277c39bc for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=85ab277c39bc Modified Files: gdk/gdk_mapreduce.c gdk/gdk_mapreduce.h monetdb5/modules/mal/joinpath.c monetdb5/optimizer/opt_joinpath.c

MonetDB: default - merging

2012-10-31 Thread Niels Nes
Changeset: 3ec7ba719d45 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3ec7ba719d45 Modified Files: monetdb5/mal/mal_dataflow.c Branch: default Log Message: merging ___ checkin-list mailing list checkin-list@monetdb.org

MonetDB: default - merging

2012-10-29 Thread Niels Nes
Changeset: 8f2f823c037e for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8f2f823c037e Added Files: monetdb5/extras/jaql/jaqltests/Tests/multiline.jaql monetdb5/extras/jaql/jaqltests/Tests/multiline.stable.err

MonetDB: default - Merging

2012-07-18 Thread Martin Kersten
Changeset: 12a1ca811ea1 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=12a1ca811ea1 Modified Files: clients/ChangeLog.Jul2012 monetdb5/extras/jaql/json.c Branch: default Log Message: Merging diffs (24 lines): diff --git a/clients/ChangeLog.Jul2012

MonetDB: default - merging heads

2012-06-26 Thread Stefan Manegold
Changeset: fd5afba57fac for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fd5afba57fac Modified Files: gdk/gdk_heap.c Branch: default Log Message: merging heads diffs (12 lines): diff --git a/gdk/gdk_heap.c b/gdk/gdk_heap.c --- a/gdk/gdk_heap.c +++ b/gdk/gdk_heap.c

MonetDB: default - merging

2012-03-11 Thread Niels Nes
Changeset: 8c8a34fa163b for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8c8a34fa163b Added Files: sql/test/Tests/setoptimizer.stable.out.Windows Modified Files: NT/installer32/MonetDB-ODBC-Installer.vdproj NT/installer32/MonetDB5-Geom-Module.vdproj

MonetDB: default - merging

2012-02-26 Thread Niels Nes
Changeset: 1decbe6e010b for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1decbe6e010b Modified Files: Branch: default Log Message: merging diffs (truncated from 527 to 300 lines): diff --git a/NT/monetdb_config.h.in b/NT/monetdb_config.h.in ---

MonetDB: default - merging

2012-02-26 Thread Niels Nes
Changeset: 4e11aefea6c0 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4e11aefea6c0 Modified Files: sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out.FreeBSD

MonetDB: default - merging

2012-02-23 Thread Niels Nes
Changeset: 7e21e8a49359 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7e21e8a49359 Modified Files: sql/jdbc/tests/Tests/Test_PSlargeamount.SQL.bat sql/jdbc/tests/Tests/Test_PSlargeamount.SQL.sh sql/jdbc/tests/Tests/Test_PSlargeamount.stable.err

MonetDB: default - merging

2012-02-19 Thread Niels Nes
Changeset: ef8a1eddc090 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ef8a1eddc090 Modified Files: sql/backends/monet5/sql.mx Branch: default Log Message: merging ___ Checkin-list mailing list Checkin-list@monetdb.org

MonetDB: default - Merging.

2012-02-16 Thread Martin Kersten
Changeset: 6333a37c8a6e for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6333a37c8a6e Modified Files: monetdb5/mal/mal_listing.c monetdb5/mal/mal_listing.h sql/backends/monet5/sql_scenario.c Branch: default Log Message: Merging. diffs (truncated from

MonetDB: default - merging head after mid-flight collision

2012-02-10 Thread Stefan Manegold
Changeset: 9c1dfd6a6d30 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9c1dfd6a6d30 Modified Files: Branch: default Log Message: merging head after mid-flight collision diffs (27 lines): diff --git a/geom/monetdb5/geom.mx b/geom/monetdb5/geom.mx ---

MonetDB: default - merging

2011-08-13 Thread Niels Nes
Changeset: cc2956f1a6eb for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=cc2956f1a6eb Modified Files: Branch: default Log Message: merging diffs (truncated from 354 to 300 lines): diff --git a/monetdb5/mal/mal_resolve.mx b/monetdb5/mal/mal_resolve.mx ---

MonetDB: default - merging

2011-06-12 Thread Niels Nes
Changeset: bf7df815817d for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=bf7df815817d Modified Files: Branch: default Log Message: merging diffs (truncated from 369 to 300 lines): diff --git a/sql/backends/monet5/datacell/50_datacell.sql

MonetDB: default - merging java fixes

2011-05-25 Thread Niels Nes
Changeset: e76cacc01537 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e76cacc01537 Modified Files: Branch: default Log Message: merging java fixes diffs (88 lines): diff --git a/java/ChangeLog b/java/ChangeLog --- a/java/ChangeLog +++ b/java/ChangeLog @@ -1,6

MonetDB: default - merging fixes from april branch

2011-05-18 Thread Niels Nes
Changeset: 9cdef8fb6dbe for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9cdef8fb6dbe Modified Files: Branch: default Log Message: merging fixes from april branch diffs (truncated from 526 to 300 lines): diff --git

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

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

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 +++

MonetDB: default - Merging

2010-12-21 Thread mk
Changeset: fd2290fd35cd for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fd2290fd35cd Modified Files: Branch: default Log Message: Merging diffs (truncated from 975 to 300 lines): diff -r 5fea5dbee4bd -r fd2290fd35cd MonetDB5/src/modules/mal/remote.mx ---

MonetDB: default - merging files.

2010-12-17 Thread mk
Changeset: f5552be7a3b2 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f5552be7a3b2 Modified Files: Branch: default Log Message: merging files. diffs (22 lines): diff -r 22cb9b53fd93 -r f5552be7a3b2 java/ChangeLog --- a/java/ChangeLogFri Dec 17 16:58:51 2010

MonetDB: default - merging

2010-09-16 Thread Niels Nes
Changeset: a371c979ad5b for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a371c979ad5b Modified Files: Branch: default Log Message: merging ___ Checkin-list mailing list Checkin-list@monetdb.org

MonetDB: default - merging from Oct2010

2010-09-15 Thread Niels Nes
Changeset: b7c83816e1d8 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b7c83816e1d8 Modified Files: sql/src/test/BugDay_2005-12-19_2.9.3/Tests/select_from_env.SF-1240701.1242164.stable.out Branch: default Log Message: merging from Oct2010 diffs (truncated from

MonetDB: default - merging heads

2010-07-21 Thread Stefan Manegold
Changeset: 17107727052d for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=17107727052d Modified Files: Branch: default Log Message: merging heads diffs (53 lines): diff -r aa33fcf66f4f -r 17107727052d clients/ChangeLog --- a/clients/ChangeLog Wed Jul 21 12:55:23

MonetDB: default - Merging changes

2010-07-20 Thread mk
Changeset: 9f5a02f26b86 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9f5a02f26b86 Modified Files: Branch: default Log Message: Merging changes diffs (truncated from 2463 to 300 lines): diff -r f3eacb82a7a5 -r 9f5a02f26b86 .hgignore --- a/.hgignore Tue Jul 20

MonetDB: default - merging

2010-07-07 Thread mk
Changeset: e4ae9e48d397 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e4ae9e48d397 Modified Files: MonetDB5/configure.ag sql/configure.ag Branch: default Log Message: merging diffs (truncated from 14248 to 300 lines): diff -r c1c8468d5b9e -r e4ae9e48d397

MonetDB: default - Merging of octopus code. Main changes:

2010-06-15 Thread Milena Ivanova
Changeset: 04fe188596d5 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=04fe188596d5 Modified Files: MonetDB5/src/modules/mal/trader.mx MonetDB5/src/optimizer/opt_octopus.mx MonetDB5/src/scheduler/run_octopus.mx

MonetDB: default - merging bug fix from Jun2010

2010-05-27 Thread Stefan Manegold
Changeset: f3c2b85025ce for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f3c2b85025ce Modified Files: MonetDB5/src/mal/mal_linker.mx Branch: default Log Message: merging bug fix from Jun2010 diffs (24 lines): diff -r 8b1c92cfef86 -r f3c2b85025ce

MonetDB: default - Merging branches

2010-05-21 Thread mk
Changeset: ef77c97f9e0c for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ef77c97f9e0c Modified Files: Branch: default Log Message: Merging branches diffs (truncated from 336 to 300 lines): diff -r 11fbb5587d03 -r ef77c97f9e0c MonetDB4/src/modules/plain/decimal.mx

MonetDB: default - merging

2010-05-21 Thread Niels Nes
Changeset: ab7257bc9881 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ab7257bc9881 Modified Files: Branch: default Log Message: merging diffs (truncated from 833 to 300 lines): diff -r 4ed7d0ca8b5d -r ab7257bc9881 MonetDB4/src/modules/plain/decimal.mx ---