Changeset: 242f87d7ee59 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=242f87d7ee59
Added Files:
        MacOSX/MonetDB_logo.png
        clients/R/Tests/dplyr.timeout
        gdk/gdk_orderidx.c
        java/tests/Test_CisValid.java
        java/tests/Test_FetchSize.java
        monetdb5/modules/mal/Tests/orderidx00.malC
        monetdb5/modules/mal/Tests/orderidx00.stable.err
        monetdb5/modules/mal/Tests/orderidx00.stable.out
        monetdb5/modules/mal/Tests/orderidx01.malC
        monetdb5/modules/mal/Tests/orderidx01.stable.err
        monetdb5/modules/mal/Tests/orderidx01.stable.out
        monetdb5/modules/mal/Tests/orderidx02.malC
        monetdb5/modules/mal/Tests/orderidx02.stable.err
        monetdb5/modules/mal/Tests/orderidx02.stable.out
        monetdb5/modules/mal/Tests/orderidx04.malC
        monetdb5/modules/mal/Tests/orderidx04.stable.err
        monetdb5/modules/mal/Tests/orderidx04.stable.out
        monetdb5/modules/mal/orderidx.c
        monetdb5/modules/mal/orderidx.h
        monetdb5/modules/mal/orderidx.mal
        sql/backends/monet5/sql_orderidx.c
        sql/backends/monet5/sql_orderidx.h
        sql/benchmarks/orderindex/experiment.sh
        sql/benchmarks/tpch/Tests/lowcardinality.sql
        sql/benchmarks/tpch/Tests/lowcardinality.stable.err
        sql/benchmarks/tpch/Tests/lowcardinality.stable.out
        sql/include/sql_query.h
        sql/jdbc/tests/Tests/Test_CisValid.SQL.bat
        sql/jdbc/tests/Tests/Test_CisValid.SQL.sh
        sql/jdbc/tests/Tests/Test_CisValid.stable.err
        sql/jdbc/tests/Tests/Test_CisValid.stable.out
        sql/jdbc/tests/Tests/Test_FetchSize.SQL.bat
        sql/jdbc/tests/Tests/Test_FetchSize.SQL.sh
        sql/jdbc/tests/Tests/Test_FetchSize.stable.err
        sql/jdbc/tests/Tests/Test_FetchSize.stable.out
        sql/scripts/18_index.sql
        sql/test/BugTracker-2014/Tests/querylog.Bug-3607.stable.err.single
        sql/test/BugTracker-2014/Tests/querylog.Bug-3607.stable.out.single
        
sql/test/BugTracker-2016/Tests/RELEASE_SAVEPOINT_after_ALTER_TABLE_crash.Bug-4010.sql
        
sql/test/BugTracker-2016/Tests/RELEASE_SAVEPOINT_after_ALTER_TABLE_crash.Bug-4010.stable.err
        
sql/test/BugTracker-2016/Tests/RELEASE_SAVEPOINT_after_ALTER_TABLE_crash.Bug-4010.stable.out
        
sql/test/BugTracker-2016/Tests/RELEASE_SAVEPOINT_after_UPDATE_crash.Bug-4010.sql
        
sql/test/BugTracker-2016/Tests/RELEASE_SAVEPOINT_after_UPDATE_crash.Bug-4010.stable.err
        
sql/test/BugTracker-2016/Tests/RELEASE_SAVEPOINT_after_UPDATE_crash.Bug-4010.stable.out
        
sql/test/BugTracker-2016/Tests/column_alias_in_where_clause.Bug-3947.stable.out.int128
        sql/test/BugTracker-2016/Tests/data3987.csv
        
sql/test/BugTracker-2016/Tests/decimal_vs_integer.Bug-3941.stable.out.32bit
        sql/test/BugTracker-2016/Tests/epoch.Bug-3979.sql
        sql/test/BugTracker-2016/Tests/epoch.Bug-3979.stable.err
        sql/test/BugTracker-2016/Tests/epoch.Bug-3979.stable.out
        sql/test/BugTracker-2016/Tests/fk-smaller-pk.Bug-3983.sql
        sql/test/BugTracker-2016/Tests/fk-smaller-pk.Bug-3983.stable.err
        sql/test/BugTracker-2016/Tests/fk-smaller-pk.Bug-3983.stable.out
        sql/test/BugTracker-2016/Tests/invalidcolumns.Bug-3968.stable.err
        sql/test/BugTracker-2016/Tests/invalidcolumns.Bug-3968.stable.out
        sql/test/BugTracker-2016/Tests/isaUUID_function.Bug-3997.sql
        sql/test/BugTracker-2016/Tests/isaUUID_function.Bug-3997.stable.err
        sql/test/BugTracker-2016/Tests/isaUUID_function.Bug-3997.stable.out
        
sql/test/BugTracker-2016/Tests/join-with-references-2sides-crashes.Bug-3980.sql
        
sql/test/BugTracker-2016/Tests/join-with-references-2sides-crashes.Bug-3980.stable.err
        
sql/test/BugTracker-2016/Tests/join-with-references-2sides-crashes.Bug-3980.stable.out
        sql/test/BugTracker-2016/Tests/leftjoin.Bug-3981.sql
        sql/test/BugTracker-2016/Tests/leftjoin.Bug-3981.stable.err
        sql/test/BugTracker-2016/Tests/leftjoin.Bug-3981.stable.out
        sql/test/BugTracker-2016/Tests/malformed-copy-int.Bug-3987.sql.in
        sql/test/BugTracker-2016/Tests/malformed-copy-int.Bug-3987.stable.err
        sql/test/BugTracker-2016/Tests/malformed-copy-int.Bug-3987.stable.out
        
sql/test/BugTracker-2016/Tests/memory-consumption-query-PLAN-25joins.Bug-3972.sql
        
sql/test/BugTracker-2016/Tests/memory-consumption-query-PLAN-25joins.Bug-3972.stable.err
        
sql/test/BugTracker-2016/Tests/memory-consumption-query-PLAN-25joins.Bug-3972.stable.out
        sql/test/BugTracker-2016/Tests/rename_exps.Bug-3974.sql
        sql/test/BugTracker-2016/Tests/rename_exps.Bug-3974.stable.err
        sql/test/BugTracker-2016/Tests/rename_exps.Bug-3974.stable.out
        sql/test/BugTracker-2016/Tests/rename_exps.Bug-3974.stable.out.32bit
        sql/test/BugTracker-2016/Tests/storagemodel.sql
        sql/test/BugTracker-2016/Tests/storagemodel.stable.err
        sql/test/BugTracker-2016/Tests/storagemodel.stable.out
        sql/test/BugTracker-2016/Tests/stream_table_crash.Bug-3952.stable.err
        sql/test/BugTracker-2016/Tests/stream_table_crash.Bug-3952.stable.out
        sql/test/BugTracker-2016/Tests/string-length.Bug-3999.sql
        sql/test/BugTracker-2016/Tests/string-length.Bug-3999.stable.err
        sql/test/BugTracker-2016/Tests/string-length.Bug-3999.stable.out
        sql/test/BugTracker-2016/Tests/subcorr-missing.Bug-3978.sql
        sql/test/BugTracker-2016/Tests/subcorr-missing.Bug-3978.stable.err
        sql/test/BugTracker-2016/Tests/subcorr-missing.Bug-3978.stable.out
        sql/test/orderidx/Tests/All
        sql/test/orderidx/Tests/simpletable.sql
        sql/test/orderidx/Tests/simpletable.stable.err
        sql/test/orderidx/Tests/simpletable.stable.out
        sql/test/orderidx/Tests/smalltable.sql
        sql/test/orderidx/Tests/smalltable.stable.err
        sql/test/orderidx/Tests/smalltable.stable.out
        sql/test/pg_regress/Tests/oid.stable.err.32bit
        sql/test/pg_regress/Tests/oid.stable.err.64bit.oid32
        sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit
        sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit
Removed Files:
        MacOSX/MonetDB logo.png
        sql/backends/monet5/embeddedclient.c.in
        sql/backends/monet5/embeddedclient.h
        sql/test/BugTracker-2016/Tests/storagemodel.Bug-3923.sql
        sql/test/BugTracker-2016/Tests/storagemodel.Bug-3923.stable.err
        sql/test/BugTracker-2016/Tests/storagemodel.Bug-3923.stable.out
        sql/test/pg_regress/Tests/oid.stable.err.oid32
Modified Files:
        .hgtags
        MacOSX/MonetDB.pkgproj
        MacOSX/post-install.sh
        MonetDB.spec
        NT/installer32/MonetDB-ODBC-Installer.vdproj
        NT/installer32/MonetDB5-Geom-Module.vdproj
        NT/installer32/MonetDB5-SQL-Installer.vdproj
        NT/installer64/MonetDB-ODBC-Installer.vdproj
        NT/installer64/MonetDB5-Geom-Module.vdproj
        NT/installer64/MonetDB5-SQL-Installer.vdproj
        NT/monetdb_config.h.in
        NT/rules.msc
        NT/updatecodes.py
        buildtools/autogen/autogen/am.py
        buildtools/autogen/autogen/msc.py
        clients/Makefile.ag
        clients/R/MonetDB.R/R/dbi.R
        clients/R/Tests/All
        clients/R/Tests/dbapply.R
        clients/R/Tests/dbi.R
        clients/R/Tests/deps-install.R
        clients/R/Tests/deps-test.R
        clients/R/Tests/dplyr-flights.R
        clients/R/Tests/dplyr-flights.stable.out
        clients/R/Tests/dplyr.R
        clients/Tests/All
        clients/Tests/MAL-signatures.stable.out
        clients/Tests/MAL-signatures.stable.out.int128
        clients/Tests/SQL-dump.stable.out
        clients/Tests/SQL-dump.stable.out.int128
        clients/Tests/exports.stable.out
        clients/mapiclient/eventparser.c
        clients/mapiclient/mclient.c
        clients/mapilib/mapi.c
        clients/mapilib/mapi.h
        clients/mapilib/mapi.rc
        clients/odbc/driver/SQLBrowseConnect.c
        clients/odbc/driver/driver.rc
        clients/odbc/winsetup/setup.rc
        clients/python2/monetdb/mapi.py
        clients/python2/setup.py
        clients/python3/monetdb/mapi.py
        clients/python3/setup.py
        common/stream/stream.c
        configure.ag
        debian/changelog
        gdk/ChangeLog-Archive
        gdk/ChangeLog.Jul2015
        gdk/Makefile.ag
        gdk/gdk.h
        gdk/gdk_align.c
        gdk/gdk_atoms.c
        gdk/gdk_bat.c
        gdk/gdk_batop.c
        gdk/gdk_bbp.c
        gdk/gdk_hash.c
        gdk/gdk_hash.h
        gdk/gdk_heap.c
        gdk/gdk_imprints.c
        gdk/gdk_join.c
        gdk/gdk_logger.c
        gdk/gdk_posix.c
        gdk/gdk_private.h
        gdk/gdk_search.c
        gdk/gdk_select.c
        gdk/gdk_storage.c
        gdk/gdk_tm.c
        gdk/gdk_utils.c
        gdk/libbat.rc
        geom/BugTracker/Tests/All
        geom/BugTracker/Tests/X_crash.SF-1971632.stable.err
        geom/lib/libgeom.c
        geom/lib/libgeom.h
        geom/monetdb5/geom.c
        geom/monetdb5/geom.h
        geom/monetdb5/geomBulk.c
        geom/sql/functions/Tests/ST_LineFromText.stable.err
        geom/sql/functions/Tests/ST_MLineFromText.stable.err
        geom/sql/functions/Tests/ST_MPointFromText.stable.err
        geom/sql/functions/Tests/ST_MPolygonFromText.stable.err
        geom/sql/functions/Tests/ST_PointFromText.stable.err
        geom/sql/functions/Tests/ST_PolygonFromText.stable.err
        geom/sql/functions/Tests/XYZ.stable.err
        java/ChangeLog.Jul2015
        java/ChangeLog.Jun2016
        java/src/main/java/nl/cwi/monetdb/jdbc/MonetConnection.java
        java/src/main/java/nl/cwi/monetdb/jdbc/MonetDatabaseMetaData.java
        java/src/main/java/nl/cwi/monetdb/jdbc/MonetDriver.java.in
        java/src/main/java/nl/cwi/monetdb/jdbc/MonetResultSet.java
        java/src/main/java/nl/cwi/monetdb/util/SQLExporter.java
        java/tests/Test_Rmetadata.java
        java/tests/build.xml
        libversions
        monetdb5/ChangeLog
        monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
        
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows
        
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows.single
        
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.single
        monetdb5/extras/mal_optimizer_template/opt_sql_append.c
        monetdb5/extras/rapi/rapi.c
        monetdb5/mal/Makefile.ag
        monetdb5/mal/Tests/tst611.malC
        monetdb5/mal/mal.c
        monetdb5/mal/mal.h
        monetdb5/mal/mal_atom.c
        monetdb5/mal/mal_authorize.c
        monetdb5/mal/mal_builder.c
        monetdb5/mal/mal_client.c
        monetdb5/mal/mal_debugger.c
        monetdb5/mal/mal_debugger.h
        monetdb5/mal/mal_errors.h
        monetdb5/mal/mal_factory.c
        monetdb5/mal/mal_function.c
        monetdb5/mal/mal_instruction.c
        monetdb5/mal/mal_instruction.h
        monetdb5/mal/mal_linker.c
        monetdb5/mal/mal_listing.c
        monetdb5/mal/mal_module.c
        monetdb5/mal/mal_namespace.c
        monetdb5/mal/mal_namespace.h
        monetdb5/mal/mal_parser.c
        monetdb5/mal/mal_profiler.c
        monetdb5/mal/mal_profiler.h
        monetdb5/mal/mal_recycle.c
        monetdb5/mal/mal_resolve.c
        monetdb5/mal/mal_runtime.c
        monetdb5/mal/mal_session.c
        monetdb5/modules/atoms/mtime.c
        monetdb5/modules/atoms/mtime.mal
        monetdb5/modules/atoms/str.c
        monetdb5/modules/atoms/str.h
        monetdb5/modules/atoms/str.mal
        monetdb5/modules/kernel/batstr.c
        monetdb5/modules/kernel/batstr.mal
        monetdb5/modules/kernel/status.c
        monetdb5/modules/mal/01_batcalc.mal
        monetdb5/modules/mal/Makefile.ag
        monetdb5/modules/mal/Tests/All
        monetdb5/modules/mal/Tests/inspect00.stable.out
        monetdb5/modules/mal/Tests/inspect05.stable.out
        monetdb5/modules/mal/Tests/inspect05.stable.out.int128
        monetdb5/modules/mal/Tests/remote03.stable.err
        monetdb5/modules/mal/bbp.c
        monetdb5/modules/mal/factories.c
        monetdb5/modules/mal/inspect.c
        monetdb5/modules/mal/language.c
        monetdb5/modules/mal/mal_init.mal
        monetdb5/modules/mal/mal_mapi.c
        monetdb5/modules/mal/mal_mapi.h
        monetdb5/modules/mal/manifold.c
        monetdb5/modules/mal/mdb.c
        monetdb5/modules/mal/profiler.c
        monetdb5/modules/mal/profiler.h
        monetdb5/modules/mal/profiler.mal
        monetdb5/modules/mal/querylog.c
        monetdb5/modules/mal/querylog.h
        monetdb5/modules/mal/querylog.mal
        monetdb5/modules/mal/remote.c
        monetdb5/modules/mal/remote.h
        monetdb5/modules/mal/tablet.c
        monetdb5/modules/mal/tablet.h
        monetdb5/optimizer/Makefile.ag
        monetdb5/optimizer/Tests/dataflow3.stable.out
        monetdb5/optimizer/Tests/inline02.stable.out
        monetdb5/optimizer/Tests/inline03.stable.out
        monetdb5/optimizer/Tests/inline04.stable.out
        monetdb5/optimizer/Tests/inline06.stable.out
        monetdb5/optimizer/Tests/inline07.stable.out
        monetdb5/optimizer/Tests/inline09.stable.out
        monetdb5/optimizer/Tests/inline10.stable.out
        monetdb5/optimizer/Tests/inline12.stable.out
        monetdb5/optimizer/Tests/inlineCst.stable.out
        monetdb5/optimizer/Tests/inlineFunction2.stable.out
        monetdb5/optimizer/Tests/manifold2.stable.out
        monetdb5/optimizer/Tests/manifold2.stable.out.single
        monetdb5/optimizer/opt_coercion.c
        monetdb5/optimizer/opt_constants.c
        monetdb5/optimizer/opt_costModel.c
        monetdb5/optimizer/opt_generator.c
        monetdb5/optimizer/opt_macro.c
        monetdb5/optimizer/opt_matpack.c
        monetdb5/optimizer/opt_mergetable.c
        monetdb5/optimizer/opt_mitosis.c
        monetdb5/optimizer/opt_mitosis.h
        monetdb5/optimizer/opt_multiplex.c
        monetdb5/optimizer/opt_pipes.c
        monetdb5/optimizer/opt_prelude.c
        monetdb5/optimizer/opt_prelude.h
        monetdb5/optimizer/opt_querylog.c
        monetdb5/optimizer/opt_remap.c
        monetdb5/optimizer/opt_reorder.c
        monetdb5/optimizer/opt_statistics.c
        monetdb5/optimizer/opt_support.c
        monetdb5/optimizer/opt_support.h
        monetdb5/optimizer/opt_volcano.c
        monetdb5/optimizer/opt_wrapper.c
        monetdb5/optimizer/optimizer.c
        monetdb5/scheduler/Makefile.ag
        monetdb5/scheduler/run_isolate.c
        monetdb5/scheduler/run_memo.c
        monetdb5/scheduler/run_pipeline.c
        monetdb5/scheduler/srvpool.c
        monetdb5/scheduler/srvpool.h
        monetdb5/tools/Makefile.ag
        monetdb5/tools/libmonetdb5.rc
        sql/backends/monet5/LSST/Makefile.ag
        sql/backends/monet5/Makefile.ag
        sql/backends/monet5/UDF/Makefile.ag
        sql/backends/monet5/UDF/Tests/udf-fuse.stable.out
        sql/backends/monet5/UDF/Tests/udf-reverse.stable.out
        sql/backends/monet5/generator/Makefile.ag
        sql/backends/monet5/rel_bin.c
        sql/backends/monet5/sql.c
        sql/backends/monet5/sql.h
        sql/backends/monet5/sql.mal
        sql/backends/monet5/sql_aggr_bte.mal
        sql/backends/monet5/sql_aggr_dbl.mal
        sql/backends/monet5/sql_aggr_flt.mal
        sql/backends/monet5/sql_aggr_hge.mal
        sql/backends/monet5/sql_aggr_int.mal
        sql/backends/monet5/sql_aggr_lng.mal
        sql/backends/monet5/sql_aggr_sht.mal
        sql/backends/monet5/sql_aggr_wrd.mal
        sql/backends/monet5/sql_decimal.mal
        sql/backends/monet5/sql_decimal.mal.sh
        sql/backends/monet5/sql_decimal_hge.mal
        sql/backends/monet5/sql_decimal_hge.mal.sh
        sql/backends/monet5/sql_execute.c
        sql/backends/monet5/sql_execute.h
        sql/backends/monet5/sql_gencode.c
        sql/backends/monet5/sql_gencode.h
        sql/backends/monet5/sql_optimizer.c
        sql/backends/monet5/sql_result.c
        sql/backends/monet5/sql_scenario.c
        sql/backends/monet5/sql_scenario.h
        sql/backends/monet5/sql_statement.c
        sql/backends/monet5/sql_upgrades.c
        sql/backends/monet5/vaults/Makefile.ag
        sql/backends/monet5/vaults/bam/Makefile.ag
        sql/backends/monet5/vaults/fits/Makefile.ag
        sql/backends/monet5/vaults/lidar/Makefile.ag
        sql/backends/monet5/vaults/netcdf/Makefile.ag
        sql/backends/monet5/vaults/shp/Makefile.ag
        sql/benchmarks/ssbm/Tests/01-explain.stable.out
        sql/benchmarks/ssbm/Tests/01-explain.stable.out.int128
        sql/benchmarks/ssbm/Tests/02-explain.stable.out
        sql/benchmarks/ssbm/Tests/02-explain.stable.out.int128
        sql/benchmarks/ssbm/Tests/03-explain.stable.out
        sql/benchmarks/ssbm/Tests/03-explain.stable.out.int128
        sql/benchmarks/ssbm/Tests/04-explain.stable.out
        sql/benchmarks/ssbm/Tests/04-explain.stable.out.int128
        sql/benchmarks/ssbm/Tests/05-explain.stable.out
        sql/benchmarks/ssbm/Tests/05-explain.stable.out.int128
        sql/benchmarks/ssbm/Tests/06-explain.stable.out
        sql/benchmarks/ssbm/Tests/06-explain.stable.out.int128
        sql/benchmarks/ssbm/Tests/07-explain.stable.out
        sql/benchmarks/ssbm/Tests/07-explain.stable.out.int128
        sql/benchmarks/ssbm/Tests/08-explain.stable.out
        sql/benchmarks/ssbm/Tests/08-explain.stable.out.int128
        sql/benchmarks/ssbm/Tests/09-explain.stable.out
        sql/benchmarks/ssbm/Tests/09-explain.stable.out.int128
        sql/benchmarks/ssbm/Tests/10-explain.stable.out
        sql/benchmarks/ssbm/Tests/10-explain.stable.out.int128
        sql/benchmarks/ssbm/Tests/load.SQL.py
        sql/benchmarks/tpch/LOCKED/Tests/load.SQL.py
        sql/benchmarks/tpch/Tests/01-explain.stable.out
        sql/benchmarks/tpch/Tests/01-explain.stable.out.32bit
        sql/benchmarks/tpch/Tests/01-explain.stable.out.int128
        sql/benchmarks/tpch/Tests/02-explain.stable.out
        sql/benchmarks/tpch/Tests/03-explain.stable.out
        sql/benchmarks/tpch/Tests/03-explain.stable.out.int128
        sql/benchmarks/tpch/Tests/04-explain.stable.out
        sql/benchmarks/tpch/Tests/04-explain.stable.out.32bit
        sql/benchmarks/tpch/Tests/05-explain.stable.out
        sql/benchmarks/tpch/Tests/05-explain.stable.out.32bit
        sql/benchmarks/tpch/Tests/05-explain.stable.out.int128
        sql/benchmarks/tpch/Tests/06-explain.stable.out
        sql/benchmarks/tpch/Tests/06-explain.stable.out.int128
        sql/benchmarks/tpch/Tests/08-explain.stable.out
        sql/benchmarks/tpch/Tests/08-explain.stable.out.int128
        sql/benchmarks/tpch/Tests/09-explain.stable.out
        sql/benchmarks/tpch/Tests/09-explain.stable.out.int128
        sql/benchmarks/tpch/Tests/10-explain.stable.out
        sql/benchmarks/tpch/Tests/10-explain.stable.out.int128
        sql/benchmarks/tpch/Tests/11-explain.stable.out
        sql/benchmarks/tpch/Tests/11-explain.stable.out.int128
        sql/benchmarks/tpch/Tests/12-explain.stable.out
        sql/benchmarks/tpch/Tests/12-explain.stable.out.int128
        sql/benchmarks/tpch/Tests/13-explain.stable.out
        sql/benchmarks/tpch/Tests/13-explain.stable.out.32bit
        sql/benchmarks/tpch/Tests/13-plan.stable.out
        sql/benchmarks/tpch/Tests/14-explain.stable.out.int128
        sql/benchmarks/tpch/Tests/15-explain.stable.out
        sql/benchmarks/tpch/Tests/15-explain.stable.out.int128
        sql/benchmarks/tpch/Tests/17-explain.stable.out
        sql/benchmarks/tpch/Tests/17-explain.stable.out.int128
        sql/benchmarks/tpch/Tests/18-explain.stable.out
        sql/benchmarks/tpch/Tests/18-explain.stable.out.int128
        sql/benchmarks/tpch/Tests/21-explain.stable.out
        sql/benchmarks/tpch/Tests/21-explain.stable.out.32bit
        sql/benchmarks/tpch/Tests/21-plan.stable.out
        sql/benchmarks/tpch/Tests/22-explain.stable.out
        sql/benchmarks/tpch/Tests/22-explain.stable.out.32bit
        sql/benchmarks/tpch/Tests/22-explain.stable.out.int128
        sql/benchmarks/tpch/Tests/All
        sql/benchmarks/tpch/Tests/load.SQL.py
        sql/benchmarks/tpch/fileleak/Tests/load.SQL.py
        sql/common/sql_types.c
        sql/include/Makefile.ag
        sql/include/sql_catalog.h
        sql/jdbc/tests/Tests/All
        sql/jdbc/tests/Tests/Test_Dobjects.stable.out
        sql/jdbc/tests/Tests/Test_JdbcClient.stable.out
        sql/jdbc/tests/Tests/Test_Rmetadata.stable.out
        sql/scripts/45_uuid.sql
        sql/scripts/75_storagemodel.sql
        sql/scripts/Makefile.ag
        sql/server/Makefile.ag
        sql/server/rel_exp.h
        sql/server/rel_optimizer.c
        sql/server/rel_partition.c
        sql/server/rel_psm.c
        sql/server/rel_rel.c
        sql/server/rel_schema.c
        sql/server/rel_select.c
        sql/server/rel_select.h
        sql/server/sql_mvc.c
        sql/server/sql_mvc.h
        sql/server/sql_parser.y
        sql/server/sql_qc.c
        sql/server/sql_scan.c
        sql/storage/bat/bat_storage.c
        sql/storage/store.c
        sql/test/ADT2006/Tests/bram.stable.out
        
sql/test/BugDay_2005-10-06_2.9.3/Tests/var_char_cast_truncate.SF-1150907.stable.out
        sql/test/BugTracker-2009/Tests/explain_gives_crash.SF-2741829.stable.out
        
sql/test/BugTracker-2009/Tests/segfault_when_quitting_debugger.SF-2538837.stable.out
        
sql/test/BugTracker-2009/Tests/updating_non-loaded_columns.SF-2864313_KO-1.sql.in
        
sql/test/BugTracker-2009/Tests/updating_non-loaded_columns.SF-2864313_KO-2.sql.in
        
sql/test/BugTracker-2009/Tests/updating_non-loaded_columns.SF-2864313_KO-3.sql.in
        
sql/test/BugTracker-2009/Tests/updating_non-loaded_columns.SF-2864313_OK-0.sql.in
        
sql/test/BugTracker-2009/Tests/updating_non-loaded_columns.SF-2864313_OK-4.sql.in
        
sql/test/BugTracker-2010/Tests/LIMIT_OFFSET_big-endian.Bug-2622.stable.out
        
sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out
        
sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out.32bit
        sql/test/BugTracker-2010/Tests/limit_in_prepare.Bug-2552.sql
        sql/test/BugTracker-2011/Tests/count-count-distinct.Bug-2808.sql
        sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out
        sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out.int128
        sql/test/BugTracker-2011/Tests/func_iter_vs_bulk.Bug-2826.stable.out
        sql/test/BugTracker-2012/Tests/All
        
sql/test/BugTracker-2012/Tests/aggregate_vs_positional_column_crash.Bug-3085.sql
        sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.sql
        sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.out
        sql/test/BugTracker-2012/Tests/querycache.Bug-3212.stable.out
        
sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out
        sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out
        sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.int128
        sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.int128.single
        sql/test/BugTracker-2013/Tests/binary_copy_into.Bug-3345.SQL.py
        sql/test/BugTracker-2013/Tests/copy-into-compressed-bz2.Bug-3351.sql.in
        sql/test/BugTracker-2013/Tests/copy-into-compressed-gz.Bug-3351.sql.in
        sql/test/BugTracker-2013/Tests/copy-into-compressed.Bug-3351.sql.in
        sql/test/BugTracker-2013/Tests/qualified_aggrname.Bug-3332.sql
        sql/test/BugTracker-2013/Tests/segfault_in_aggregation.Bug-3225.sql.in
        sql/test/BugTracker-2013/Tests/swapped_likejoin.Bug-3375.sql
        sql/test/BugTracker-2013/Tests/swapped_likejoin.Bug-3375.stable.out
        sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.stable.out
        sql/test/BugTracker-2014/Tests/querylog.Bug-3607.stable.out
        sql/test/BugTracker-2014/Tests/select-having.Bug-3458.sql
        sql/test/BugTracker-2015/Tests/cardinality.Bug-3761.sql
        sql/test/BugTracker-2015/Tests/copy_into.Bug-3813.sql.in
        sql/test/BugTracker-2015/Tests/schemadiff.Bug-3778.SQL.py
        sql/test/BugTracker-2015/Tests/schemadiff.Bug-3778.stable.err
        sql/test/BugTracker-2015/Tests/schemadiff.Bug-3778.stable.out
        sql/test/BugTracker-2015/Tests/useless_casts.Bug-3756.stable.out
        sql/test/BugTracker-2016/Tests/All
        
sql/test/BugTracker-2016/Tests/DISTINCT_with_correlated_scalar_subquery_crashes_mserver.Bug-3920.sql
        sql/test/BugTracker-2016/Tests/column_alias_in_where_clause.Bug-3947.sql
        
sql/test/BugTracker-2016/Tests/column_alias_in_where_clause.Bug-3947.stable.err
        
sql/test/BugTracker-2016/Tests/column_alias_in_where_clause.Bug-3947.stable.out
        sql/test/BugTracker-2016/Tests/decimal_vs_integer.Bug-3941.stable.out
        sql/test/BugTracker-2016/Tests/merge_project.Bug-3955.sql
        sql/test/BugTracker-2016/Tests/merge_project.Bug-3955.stable.out
        
sql/test/BugTracker-2016/Tests/min-max-uuid-column-wrong-results.Bug-3953.sql.in
        sql/test/BugTracker-2016/Tests/stream_table_crash.Bug-3952.sql
        
sql/test/BugTracker-2016/Tests/wrong-nonil-property-with-copy-binary-into.Bug-3937.sql.in
        sql/test/BugTracker/Tests/authorization.SF-1430616.stable.out
        sql/test/BugTracker/Tests/bug_in_selection.SF-1892413.stable.out
        sql/test/BugTracker/Tests/caching.SF-1651599.stable.out
        sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
        sql/test/BugTracker/Tests/insert_not_exists.SF-1380287.stable.out
        sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
        sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out.32bit
        sql/test/Dependencies/Tests/Dependencies.stable.err
        sql/test/Dependencies/Tests/Dependencies.stable.out
        sql/test/Dependencies/Tests/Dependencies.stable.out.int128
        sql/test/Dependencies/Tests/dependency_loop.stable.out.int128
        sql/test/Tests/All
        sql/test/Tests/decimal2.stable.out
        sql/test/Tests/median_stdev.stable.out
        sql/test/Tests/outerref_in_selection.stable.out
        sql/test/Tests/outerref_in_selection.stable.out.int128
        sql/test/Tests/setoptimizer.stable.out
        sql/test/Tests/setoptimizer.stable.out.Windows
        sql/test/Tests/str-pad.stable.out
        sql/test/Tests/str-trim.stable.out
        sql/test/Tests/string.stable.out
        sql/test/Tests/systemfunctions.stable.out
        sql/test/Tests/systemfunctions.stable.out.int128
        sql/test/Users/Tests/copyinto.SQL.py
        sql/test/Users/Tests/copyinto.stable.err
        sql/test/Users/Tests/dropManyUsers.Bug-3764.SQL.py
        sql/test/Users/Tests/dropManyUsers.Bug-3764.stable.out
        sql/test/Users/Tests/grantMonetdb.stable.err
        sql/test/Users/Tests/test_privs2_p1.stable.out
        sql/test/bugs/Tests/crash_order_by.sql
        sql/test/bugs/Tests/except-union-intersect-bug-sf-1146079.stable.out
        sql/test/bugs/Tests/simple_view.sql
        sql/test/bugs/Tests/unicode_varchar-bug-sf-1041324_JdbcClient.stable.out
        sql/test/bugs/Tests/unicode_varchar-bug-sf-1041324_MapiClient.stable.out
        sql/test/bugs/insert_delete-bug-sf-904025.sql
        sql/test/emptydb-upgrade-chain-hge/Tests/check.stable.out.int128
        sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
        sql/test/emptydb-upgrade-chain/Tests/check.stable.out
        sql/test/emptydb-upgrade-chain/Tests/check.stable.out.int128
        sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
        sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
        sql/test/emptydb-upgrade-hge/Tests/check.stable.out.int128
        sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
        sql/test/emptydb-upgrade/Tests/check.stable.out
        sql/test/emptydb-upgrade/Tests/check.stable.out.int128
        sql/test/emptydb-upgrade/Tests/upgrade.stable.out
        sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
        sql/test/emptydb/Tests/check.stable.out
        sql/test/emptydb/Tests/check.stable.out.int128
        sql/test/json/Tests/All
        sql/test/leaks/Tests/All
        sql/test/leaks/Tests/check0.stable.out
        sql/test/leaks/Tests/check0.stable.out.int128
        sql/test/leaks/Tests/check1.stable.out
        sql/test/leaks/Tests/check1.stable.out.int128
        sql/test/leaks/Tests/check2.stable.out
        sql/test/leaks/Tests/check2.stable.out.int128
        sql/test/leaks/Tests/check3.stable.out
        sql/test/leaks/Tests/check3.stable.out.int128
        sql/test/leaks/Tests/check4.stable.out
        sql/test/leaks/Tests/check4.stable.out.int128
        sql/test/leaks/Tests/check5.stable.out
        sql/test/leaks/Tests/check5.stable.out.int128
        sql/test/leaks/Tests/drop3.stable.out
        sql/test/leaks/Tests/drop3.stable.out.int128
        sql/test/leaks/Tests/select1.stable.out
        sql/test/leaks/Tests/select1.stable.out.int128
        sql/test/leaks/Tests/select2.stable.out
        sql/test/leaks/Tests/select2.stable.out.int128
        sql/test/leaks/Tests/temp1.stable.out
        sql/test/leaks/Tests/temp1.stable.out.int128
        sql/test/leaks/Tests/temp2.stable.out
        sql/test/leaks/Tests/temp2.stable.out.int128
        sql/test/leaks/Tests/temp3.stable.out
        sql/test/leaks/Tests/temp3.stable.out.int128
        sql/test/mergetables/Tests/mergequery.stable.out
        sql/test/pg_regress/Tests/All
        sql/test/pg_regress/Tests/arrays.stable.err
        sql/test/pg_regress/Tests/box.stable.err
        sql/test/pg_regress/Tests/oid.stable.err
        sql/test/pg_regress/Tests/oid.stable.err.int128
        sql/test/pg_regress/Tests/path.stable.err
        sql/test/pg_regress/Tests/point.stable.err
        sql/test/pg_regress/Tests/polygon.stable.err
        sql/test/pg_regress/Tests/strings.stable.out
        sql/test/pg_regress/Tests/vacuum.sql
        sql/test/pg_regress/Tests/without_oid.sql
        sql/test/pg_regress/Tests/without_oid.stable.out
        sql/test/pg_regress/Tests/without_oid.stable.out.oid32
        sql/test/remote/Tests/partition_elim.stable.out
        sql/test/remote/Tests/ssbm.SQL.py
        sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out
        sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
        sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
        sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out
        sql/test/testdb-upgrade/Tests/upgrade.stable.out
        sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
        testing/Mfilter.py
        testing/Mtest.py.in
        tools/embedded/Makefile.ag
        tools/embedded/Tests/All
        tools/embedded/Tests/lowlevel.R
        tools/embedded/build-on-windows.bat
        tools/embedded/build-rpkg.sh
        tools/embedded/embedded.c
        tools/embedded/inlined_scripts.c
        tools/embedded/inlined_scripts.py
        tools/embedded/inlined_scripts.sh
        tools/embedded/pkg-excludes
        tools/embedded/rpackage/DESCRIPTION
        tools/embedded/rpackage/R/monetdb.R
        tools/embedded/rpackage/configure
        tools/embedded/rpackage/configure.win
        tools/embedded/windows/sedscript.tpl
        tools/merovingian/daemon/monetdbd.1.in
        tools/mserver/mserver5.c
        vertoo.data
Branch: stratified_sampling
Log Message:

Merge default into stratified_sampling


diffs (truncated from 184127 to 300 lines):

diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -620,3 +620,5 @@ feec2e4020548d3137a0e946b7a4e29db5b9e14a
 ee2d8c8d65c35ed022ca0785f30fcf4b051a542e Jun2016_root
 ee54e50fccb17db48bbfd983882e8491a869131c Jul2015_17
 ee54e50fccb17db48bbfd983882e8491a869131c Jul2015_SP3_release
+51322027cb7e7c27f03fc7c3cab4db4fd4cd4446 Jul2015_19
+51322027cb7e7c27f03fc7c3cab4db4fd4cd4446 Jul2015_SP4_release
diff --git a/MacOSX/MonetDB.pkgproj b/MacOSX/MonetDB.pkgproj
--- a/MacOSX/MonetDB.pkgproj
+++ b/MacOSX/MonetDB.pkgproj
@@ -544,7 +544,7 @@
                                <key>BACKGROUND_PATH</key>
                                <dict>
                                        <key>PATH</key>
-                                       <string>MonetDB logo.png</string>
+                                       <string>MonetDB_logo.png</string>
                                        <key>PATH_TYPE</key>
                                        <integer>1</integer>
                                </dict>
diff --git a/MacOSX/MonetDB logo.png b/MacOSX/MonetDB_logo.png
rename from MacOSX/MonetDB logo.png
rename to MacOSX/MonetDB_logo.png
diff --git a/MacOSX/post-install.sh b/MacOSX/post-install.sh
--- a/MacOSX/post-install.sh
+++ b/MacOSX/post-install.sh
@@ -2,6 +2,14 @@
 
 monetdb_path=/usr/local/monetdb/bin
 
-if [[ ":$PATH:" != *":$monetdb_path:"* ]]; then
-    printf '\n# Set MonetDB path\nexport PATH=$PATH:'$monetdb_path'\n' >> 
~/.profile
-fi
+case $PATH in
+*:$monetdb_path|*:$monetdb_path:*|$monetdb_path:*)
+    ;;
+*)
+    cat >> ~/.profile <<EOF
+
+# Set MonetDB path
+export PATH=\$PATH:$monetdb_path
+EOF
+    ;;
+esac
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -104,7 +104,7 @@ Vendor: MonetDB BV <i...@monetdb.org>
 Group: Applications/Databases
 License: MPLv2.0
 URL: http://www.monetdb.org/
-Source: 
http://dev.monetdb.org/downloads/sources/Jul2015-SP3/%{name}-%{version}.tar.bz2
+Source: 
http://dev.monetdb.org/downloads/sources/Jul2015-SP4/%{name}-%{version}.tar.bz2
 
 # we need systemd for the _unitdir macro to exist
 BuildRequires: systemd
@@ -986,6 +986,20 @@ rm -f %{buildroot}%{_bindir}/Maddlog
 %postun -p /sbin/ldconfig
 
 %changelog
+* Tue Apr 05 2016 Sjoerd Mullender <sjo...@acm.org> - 11.21.19-20160405
+- Rebuilt.
+- BZ#3905: MonetDB doesn't handle ANY/SOME/ALL operator correctly
+- BZ#3929: R aggregate not recognized when using 3 or more parameters
+- BZ#3965: Not possible to quote/escape single quote character in the
+  name of the file to load.
+- BZ#3968: Missing double use of column names
+
+* Mon Apr  4 2016 Sjoerd Mullender <sjo...@acm.org> - 11.21.19-20160405
+- gdk: Fixed a bug that caused various instances where old data returned or
+  where crashes occurred.  The problem was that internally data wasn't
+  always marked dirty when it was being changed, causing later processing
+  to not deal with the changed data correctly.
+
 * Thu Mar 24 2016 Sjoerd Mullender <sjo...@acm.org> - 11.21.17-20160324
 - Rebuilt.
 - BZ#2972: SQL URL functionality contains errors
diff --git a/NT/monetdb_config.h.in b/NT/monetdb_config.h.in
--- a/NT/monetdb_config.h.in
+++ b/NT/monetdb_config.h.in
@@ -315,11 +315,12 @@
 
 /* Define to 1 if you have the <locale.h> header file. */
 #define HAVE_LOCALE_H 1
-
+#ifdef _MSC_VER
 /* Define to 1 if you have the `localtime_r' function. */
 #define HAVE_LOCALTIME_R 1
 /* there is something very similar to localtime_r on Windows: */
 #define localtime_r(tp,tm)     localtime_s(tm,tp)
+#endif
 
 /* Define to 1 if you have the `lockf' function. */
 /* #undef HAVE_LOCKF */
@@ -1134,6 +1135,11 @@ typedef __uint128_t uhge;
 #ifdef HAVE_EMBEDDED_R
 #define _MSC_EXTENSIONS 1
 #undef HAVE_CTIME_R
+#else
+#define HAVE_MAPI 1
 #endif
 
+#define PROMPT1                "\001\001\n"    /* prompt: ready for new query 
*/
+#define PROMPT2                "\001\002\n"    /* prompt: more data needed */
+
 #endif /* _SEEN_MONETDB_CONFIG_H */
diff --git a/NT/updatecodes.py b/NT/updatecodes.py
--- a/NT/updatecodes.py
+++ b/NT/updatecodes.py
@@ -13,20 +13,22 @@ prcdre = re.compile('"ProductCode" = "8:
 pacdre = re.compile('"PackageCode" = "8:{(.*)}"')
 
 def update(f):
-    p = subprocess.Popen(['uuidgen'], stdout = subprocess.PIPE)
+    p = subprocess.Popen(['uuidgen'], stdout = subprocess.PIPE,
+                         universal_newlines = True)
     u, e = p.communicate()
-    productcode = u.strip('\r\n').upper()
-    p = subprocess.Popen(['uuidgen'], stdout = subprocess.PIPE)
+    productcode = u.strip('\n').upper()
+    p = subprocess.Popen(['uuidgen'], stdout = subprocess.PIPE,
+                         universal_newlines = True)
     u, e = p.communicate()
-    packagecode = u.strip('\r\n').upper()
-    fp = open(f, 'rb')
+    packagecode = u.strip('\n').upper()
+    fp = open(f)
     data = fp.read()
     fp.close()
     repl = '"ProductCode" = "8:{%s}"' % productcode
     data = prcdre.sub(repl, data)
     repl = '"PackageCode" = "8:{%s}"' % packagecode
     data = pacdre.sub(repl, data)
-    fp = open(f, 'wb')
+    fp = open(f, 'w')
     fp.write(data)
     fp.close()
 
diff --git a/buildtools/autogen/autogen/am.py b/buildtools/autogen/autogen/am.py
--- a/buildtools/autogen/autogen/am.py
+++ b/buildtools/autogen/autogen/am.py
@@ -829,105 +829,6 @@ def am_library(fd, var, libmap, am):
 
     am_deps(fd, libmap['DEPS'], am)
 
-def am_libs(fd, var, libsmap, am):
-
-    ld = "libdir"
-    if ("DIR" in libsmap):
-        ld = libsmap["DIR"][0] # use first name given
-    ld = am_translate_dir(ld, am)
-
-    sep = ""
-    if 'SEP' in libsmap:
-        sep = libsmap['SEP'][0]
-
-    scripts_ext = []
-    if 'SCRIPTS' in libsmap:
-        scripts_ext = libsmap['SCRIPTS']
-
-    if 'MTSAFE' in libsmap:
-        fd.write("CFLAGS %s $(THREAD_SAVE_FLAGS)\n" % am_assign)
-
-    libnames = []
-    for libsrc in libsmap['SOURCES']:
-        SCRIPTS = []
-        libname, libext = split_filename(libsrc)
-        am['EXTRA_DIST'].append(libsrc)
-
-        libnames.append(sep+libname)
-
-# temporarily switched off, the scripts created by libtool cause problems
-# for so-so linking
-#    if libname + "_LIBS" in libsmap:
-#      fd.write(am_additional_libs(libname, sep, "LIB", libsmap[libname + 
"_LIBS"], am))
-#    elif "LIBS" in libsmap:
-#      fd.write(am_additional_libs(libname, sep, "LIB", libsmap["LIBS"], am))
-        _libs = []
-        if libname + "_DLIBS" in libsmap:
-            _libs += libsmap[libname + "_DLIBS"]
-            fd.write(am_additional_install_libs(libname, sep, libsmap[libname+ 
"_DLIBS"], am))
-
-        if "LIBS" in libsmap:
-            _libs += libsmap["LIBS"]
-        if "LDFLAGS" in libsmap:
-            _libs += libsmap["LDFLAGS"]
-        if 'VERSION' in libsmap:
-            version = ['-version-info', libsmap['VERSION'][0]]
-        elif 'MODULE' in libsmap:
-            version = ['-module', '-avoid-version']
-        else:
-            version = []
-        fd.write(am_additional_flags(libname, sep, "LIB", version, am))
-        if len(_libs) > 0:
-            fd.write(am_additional_libs(libname, sep, "LIB", _libs, am))
-
-        fullpref = "lib"+sep+libname+'_la'
-        nsrcs = "nodist_"+fullpref+"_SOURCES ="
-        srcs = "dist_"+fullpref+" ="
-        for target in libsmap['TARGETS']:
-            t, ext = split_filename(target)
-            if t == libname:
-                if ext in scripts_ext:
-                    if target not in SCRIPTS:
-                        SCRIPTS.append(target)
-                else:
-                    dist, src = am_find_srcs(target, libsmap['DEPS'], am, None)
-                    if src == libsrc:
-                        dist = True
-                    if dist:
-                        srcs = srcs + " " + src
-                    else:
-                        nsrcs = nsrcs + " " + src
-                if target[-2:] == '.o' and target in libsmap['DEPS']:
-                    am_dep(fd, target, libsmap['DEPS'][target], am, 
fullpref+"-")
-                    basename = target[:-2]
-                    fd.write('\t$(LIBTOOL) --tag=CC --mode=compile $(CC) 
$(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(%s_CFLAGS) 
$(CFLAGS) $(%s_CFLAGS) -c -o %s-%s.lo `test -f \'%s.c\' || echo 
\'$(srcdir)/\'`%s.c\n' % (fullpref, basename, fullpref, basename, basename, 
basename))
-        fd.write(nsrcs + "\n")
-        fd.write(srcs + "\n")
-
-        if len(SCRIPTS) > 0:
-            fd.write("%s_scripts = %s\n\n" % (libname, am_list2string(SCRIPTS, 
" ", "")))
-            am['BUILT_SOURCES'].append("$(" + libname + "_scripts)")
-            fd.write("all-local-%s: $(%s_scripts)\n" % (libname, libname))
-            am['ALL'].append(libname)
-
-        fd.write("%sdir = %s\n" % (libname, ld))
-        fd.write("lib%s%s_la_CFLAGS=-DLIB%s $(AM_CFLAGS)\n" % 
(sep,libname,libname.upper()))
-        am['LIBS'].append(('lib', libname, sep, ''))
-        am['InstallList'].append("\t"+ld+sep+libname+".so\n")
-
-    if 'HEADERS' in libsmap:
-        HDRS = []
-        hdrs_ext = libsmap['HEADERS']
-        for target in libsmap['DEPS'].keys():
-            t, ext = split_filename(target)
-            if ext in hdrs_ext:
-                am['HDRS'].append(target)
-                if ext not in automake_ext:
-                    am['EXTRA_DIST'].append(target)
-
-    am_find_ins(am, libsmap)
-    am_deps(fd, libsmap['DEPS'], am)
-
 def am_python_generic(fd, var, python, am, PYTHON):
     pyre = re.compile(r'packages *= *\[ *(.*[^ ]) *\]')
     pynmre = re.compile('name *= *([\'"])([^\'"]+)\\1')
@@ -1083,7 +984,6 @@ output_funcs = {'SUBDIRS': am_subdirs,
                 'EXTRA_DIST_DIR': am_extra_dist_dir,
                 'EXTRA_HEADERS': am_extra_headers,
                 'LIBDIR': am_libdir,
-                'LIBS': am_libs,
                 'LIB': am_library,
                 'BINS': am_bins,
                 'BIN': am_binary,
@@ -1143,7 +1043,7 @@ AUTOMAKE_OPTIONS = no-dependencies 1.4 f
     am['BUILT_SOURCES'] = []            # generated source files
     am['CLEAN'] = []                    # files to be cleaned with make clean
     am['EXTRA_DIST'] = []
-    am['LIBS'] = []                     # all libraries (am_libs and 
am_library)
+    am['LIBS'] = []                     # all libraries (am_library)
     am['NLIBS'] = []                    # all libraries which are not installed
     am['BINS'] = []
     am['NBINS'] = []
diff --git a/buildtools/autogen/autogen/msc.py 
b/buildtools/autogen/autogen/msc.py
--- a/buildtools/autogen/autogen/msc.py
+++ b/buildtools/autogen/autogen/msc.py
@@ -858,97 +858,6 @@ def msc_library(fd, var, libmap, msc):
 
     msc_deps(fd, libmap['DEPS'], ".obj", msc)
 
-def msc_libs(fd, var, libsmap, msc):
-
-    lib = "lib"
-    ld = "LIBDIR"
-    if "DIR" in libsmap:
-        lib = "libs"
-        ld = libsmap["DIR"][0] # use first name given
-    ld = msc_translate_dir(ld,msc)
-
-    sep = ""
-    if 'SEP' in libsmap:
-        sep = libsmap['SEP'][0]
-
-    SCRIPTS = []
-    scripts_ext = []
-    if 'SCRIPTS' in libsmap:
-        scripts_ext = libsmap['SCRIPTS']
-
-    if 'MTSAFE' in libsmap:
-        fd.write("CFLAGS=$(CFLAGS) $(thread_safe_flag_spec)\n")
-
-    for libsrc in libsmap['SOURCES']:
-        libname, ext = split_filename(libsrc)
-        #if ext not in automake_ext:
-        msc['EXTRA_DIST'].append(libsrc)
-        v = sep + libname
-        msc['LIBS'].append('lib' + v + '.dll')
-        msc['INSTALL']['lib' + v] = 'lib' + v + '.dll', '.dll', ld, 'lib' + v 
+ '.lib', ''
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to