MonetDB: pyapi - Merge

2015-05-29 Thread Mark Raasveldt
Changeset: 66be10fc2789 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=66be10fc2789 Modified Files: monetdb5/extras/pyapi/pyapi.c Branch: pyapi Log Message: Merge diffs (12 lines): diff --git a/monetdb5/extras/pyapi/pyapi.c b/monetdb5/extras/pyapi/pyapi.c --- a/mo

MonetDB: pyapi - Merge

2015-06-14 Thread Mark Raasveldt
Changeset: f8230c079217 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f8230c079217 Added Files: buildtools/ChangeLog.Jul2015 clients/ChangeLog.Jul2015 clients/mapilib/ChangeLog.Jul2015 clients/python2/ChangeLog.Jul2015 clients/python3/

MonetDB: pyapi - Merge.

2015-08-10 Thread Mark Raasveldt
Changeset: 08d8961ace58 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=08d8961ace58 Modified Files: gdk/shared_memory.c gdk/shared_memory.h monetdb5/extras/pyapi/Benchmarks/pyapi_test.sh monetdb5/extras/pyapi/pyapi.c monetdb5/extras/pya

MonetDB: pyapi - merge default

2015-04-26 Thread Hannes Muehleisen
Changeset: f57a4d8d5a04 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f57a4d8d5a04 Added Files: clients/Tests/MAL-signatures.malC clients/Tests/MAL-signatures.stable.err clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stab

MonetDB: pyapi - Merge newlines.

2015-06-08 Thread Mark Raasveldt
Changeset: 64c3f5fda4dc for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=64c3f5fda4dc Added Files: sql/test/BugTracker-2015/Tests/string_split.Bug-3564.sql sql/test/BugTracker-2015/Tests/string_split.Bug-3564.stable.err sql/test/BugTracker-2015/Tests/str

MonetDB: pyapi - Merge with default.

2015-11-13 Thread Mark Raasveldt
Changeset: e6488821a9e4 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e6488821a9e4 Added Files: clients/ruby/Tests/All clients/ruby/Tests/gemtest.rb clients/ruby/Tests/gemtest.stable.err clients/ruby/Tests/gemtest.stable.out clients/ru

MonetDB: pyapi - merge with default

2015-06-08 Thread Hannes Muehleisen
Changeset: c9c479e3683a for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c9c479e3683a Added Files: sql/scripts/51_sys_schema_extension.sql sql/test/BugTracker-2015/Tests/adddrop_unknown_table.Bug-3718.sql sql/test/BugTracker-2015/Tests/adddrop_unknown_ta

MonetDB: pyapi - merge with default

2015-06-12 Thread Hannes Muehleisen
Changeset: f2719860c6fb for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f2719860c6fb Added Files: buildtools/ChangeLog.Jul2015 clients/ChangeLog.Jul2015 clients/mapilib/ChangeLog.Jul2015 clients/python2/ChangeLog.Jul2015 clients/python3/

MonetDB: pyapi - Merge with default.

2015-06-30 Thread Mark Raasveldt
Changeset: e0810a1f68f0 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e0810a1f68f0 Added Files: .hgignore common/utils/strptime.c sql/test/BugTracker-2015/Tests/cast_to_num.Bug-3744.sql sql/test/BugTracker-2015/Tests/cast_to_num.Bug-3744.stabl

MonetDB: pyapi - Merge with default.

2015-07-05 Thread Mark Raasveldt
Changeset: a7c663de357a for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a7c663de357a Added Files: clients/R/MonetDB.R/R/dbapply.R clients/R/MonetDB.R/man/dbApply.Rd clients/R/Tests/dbapply.R clients/R/Tests/dbapply.reqtests clients/R/Tes

MonetDB: pyapi - Merge with default.

2015-07-07 Thread Mark Raasveldt
Changeset: 9fd0726406f9 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9fd0726406f9 Modified Files: clients/R/MonetDB.R/DESCRIPTION clients/R/MonetDB.R/NEWS clients/R/MonetDB.R/R/dbi.R clients/R/MonetDB.R/R/mapi.R clients/R/Tests/dbappl

MonetDB: pyapi - Merge with default.

2015-07-16 Thread Mark Raasveldt
Changeset: 7ce7f53da2dc for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7ce7f53da2dc Added Files: clients/R/Tests/dplyr-flights.R clients/R/Tests/dplyr-flights.reqtest clients/R/Tests/dplyr-flights.stable.err clients/R/Tests/dplyr-flights.stable

MonetDB: pyapi - Merge with default.

2015-07-20 Thread Mark Raasveldt
Changeset: c5c2db4f0ee9 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c5c2db4f0ee9 Modified Files: clients/R/Tests/dplyr-flights.stable.err clients/Tests/SQL-dump.stable.out clients/Tests/SQL-dump.stable.out.int128 common/utils/msabaoth.c

MonetDB: pyapi - Merge with default.

2015-07-23 Thread Mark Raasveldt
Changeset: bc905bc7dc51 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=bc905bc7dc51 Added Files: MacOSX/MonetDB logo.png MacOSX/MonetDB.pkgproj MacOSX/post-install.sh MacOSX/readme.rtf MacOSX/summary.rtf clients/R/Tests/deps-ins

MonetDB: pyapi - Merge with default.

2015-07-30 Thread Mark Raasveldt
Changeset: d65956b0d95e for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d65956b0d95e Added Files: sql/test/BugTracker-2015/Tests/schemadiff.SQL.py sql/test/Users/Tests/columnRights.SQL.py sql/test/Users/Tests/columnRights.stable.err sql/test/Use

MonetDB: pyapi - Merge with default.

2015-08-03 Thread Mark Raasveldt
Changeset: bf1419bf9890 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=bf1419bf9890 Added Files: common/utils/mprompt.h common/utils/prompt.c sql/test/BugTracker-2015/Tests/apply_merge_distinct.Bug-3760.sql sql/test/BugTracker-2015/Tests/apply_

MonetDB: pyapi - Merge with default.

2015-08-11 Thread Mark Raasveldt
Changeset: 4d4f45451528 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4d4f45451528 Added Files: debian/libmonetdb-stream7.install debian/libmonetdb12.install sql/backends/monet5/sql_rank.c sql/backends/monet5/sql_rank.h sql/test/Users/

MonetDB: pyapi - Merge with default.

2015-08-27 Thread Mark Raasveldt
Changeset: c5372976fa52 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c5372976fa52 Added Files: clients/R/Tests/testrandom.R clients/R/Tests/testrandom.reqtests clients/R/Tests/testrandom.stable.err clients/R/Tests/testrandom.stable.out

MonetDB: pyapi - Merge with default.

2015-09-12 Thread Mark Raasveldt
Changeset: 9d8c396dc169 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9d8c396dc169 Added Files: java/src/main/java/nl/cwi/monetdb/client/JMonetDB.java java/src/main/java/nl/cwi/monetdb/client/JdbcClient.java java/src/main/java/nl/cwi/monetdb/jdbc/Mone

MonetDB: pyapi - Merge with default.

2015-10-14 Thread Mark Raasveldt
Changeset: e0cea0103b8b for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e0cea0103b8b Added Files: monetdb5/mal/Tests/tst1602.timeout monetdb5/modules/mal/Tests/bigsum.timeout monetdb5/optimizer/opt_candidates.c monetdb5/optimizer/opt_candidates.

MonetDB: pyapi - Merge with embedded branch.

2015-10-30 Thread Mark Raasveldt
Changeset: 65f18487fd7c for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=65f18487fd7c Added Files: tools/embeddedpy/embedded.c tools/embeddedpy/embedded.h Modified Files: gdk/gdk_bbp.c gdk/gdk_logger.c gdk/gdk_storage.c gdk/gdk_ut

MonetDB: pyapi - Merge with default branch.

2015-04-29 Thread Sjoerd Mullender
Changeset: f734abf51b28 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f734abf51b28 Modified Files: geom/monetdb5/geom.mal monetdb5/mal/mal_parser.c monetdb5/modules/atoms/color.mal monetdb5/modules/atoms/inet.mal monetdb5/modules/atoms

MonetDB: pyapi - Merge with default branch.

2015-04-30 Thread Sjoerd Mullender
Changeset: 26d840949c0a for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=26d840949c0a Modified Files: NT/wincompile.py clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/mapiclient/Tests/tomograph--help

MonetDB: pyapi - Merge with default branch.

2015-05-04 Thread Sjoerd Mullender
Changeset: fe92ba023dd6 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fe92ba023dd6 Modified Files: clients/mapiclient/tomograph.c gdk/gdk_logger.c Branch: pyapi Log Message: Merge with default branch. diffs (296 lines): diff --git a/clients/mapiclient/tom

MonetDB: pyapi - Merge with default branch.

2015-05-04 Thread Sjoerd Mullender
Changeset: 7fec7c1605ac for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7fec7c1605ac Modified Files: NT/winconfig.py gdk/gdk_logger.c sql/backends/monet5/sql_upgrades.c sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out sql/test/test

MonetDB: pyapi - Merge with default branch.

2015-05-07 Thread Sjoerd Mullender
Changeset: 71b5d245d6e9 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=71b5d245d6e9 Modified Files: clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/mapiclient/tomograph.c configure.ag gdk/g

MonetDB: pyapi - Merge with default branch.

2015-05-08 Thread Sjoerd Mullender
Changeset: 188fef8cb27d for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=188fef8cb27d Added Files: sql/test/BugTracker-2015/Tests/convert-to-bit.Bug-3719.sql sql/test/BugTracker-2015/Tests/convert-to-bit.Bug-3719.stable.err sql/test/BugTracker-2015/Tests

MonetDB: pyapi - Merge with default branch.

2015-05-11 Thread Sjoerd Mullender
Changeset: 381cdb1dcbcd for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=381cdb1dcbcd Added Files: sql/test/mergetables/Tests/mergequery.stable.out.single Modified Files: clients/mapiclient/tachograph.c clients/mapiclient/tomograph.c gdk/gdk_grou

MonetDB: pyapi - Merge with default branch.

2015-05-13 Thread Sjoerd Mullender
Changeset: 01cc2b6bb28c for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=01cc2b6bb28c Modified Files: MonetDB.spec clients/Tests/exports.stable.out clients/mapiclient/eventparser.c clients/mapiclient/mclient.c clients/mapiclient/tachograp

MonetDB: pyapi - Merge with default branch.

2015-05-13 Thread Sjoerd Mullender
Changeset: d4e329db4a64 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d4e329db4a64 Modified Files: clients/mapiclient/Tests/mclient--help.stable.err clients/mapiclient/Tests/mclient--help.stable.err.Windows clients/mapiclient/mclient.c clients

MonetDB: pyapi - Merge with embedded branch.

2015-08-29 Thread Mark Raasveldt
Changeset: 55fd678c6070 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=55fd678c6070 Modified Files: monetdb5/modules/mal/mal_mapi.c sql/backends/monet5/mal_backend.h sql/backends/monet5/sql.c sql/backends/monet5/sql_execute.c sql/backen

MonetDB: pyapi - Merge with pyapi branch.

2015-08-29 Thread Mark Raasveldt
Changeset: 831cb403f522 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=831cb403f522 Added Files: clients/R/Tests/testrandom.R clients/R/Tests/testrandom.reqtests clients/R/Tests/testrandom.stable.err clients/R/Tests/testrandom.stable.out

MonetDB: pyapi - Merge with default, fixes pyapi08.sql.

2015-06-16 Thread Mark Raasveldt
Changeset: 080a955d803d for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=080a955d803d Added Files: debian/monetdb-client-tools.docs debian/monetdb5-server.docs sql/backends/monet5/Tests/pyapi08.sql.orig sql/backends/monet5/Tests/pyapi08.stable.er

MonetDB: pyapi - Merge with embedded branch, removed some hacks.

2015-10-14 Thread Mark Raasveldt
Changeset: d750ee07df6e for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d750ee07df6e Modified Files: gdk/gdk_utils.c gdk/gdk_utils.h monetdb5/extras/pyapi/Benchmarks/monetdb_testing.py monetdb5/extras/pyapi/Tests/pyapi_returntypes.stable.err