Changeset: 1effd817a7e3 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1effd817a7e3
Added Files:
        clients/python2/test/run.cmd
        clients/python2/test/test_pythonize.py
        clients/python3/test/control.py
        clients/python3/test/run.cmd
        clients/python3/test/test_pythonize.py
        debian/libmonetdb9.install
        debian/monetdb-client-tools.install
        gdk/gdk_join.c
        monetdb5/mal/Tests/tst275.mal
        monetdb5/mal/Tests/tst275.stable.err
        monetdb5/mal/Tests/tst275.stable.out
        monetdb5/modules/kernel/group.c
        monetdb5/modules/kernel/group.h
        monetdb5/modules/kernel/group.mal
        monetdb5/modules/mal/Tests/batpartition.mal
        monetdb5/modules/mal/Tests/batpartition.stable.err
        monetdb5/modules/mal/Tests/batpartition.stable.out
        monetdb5/modules/mal/Tests/callfunction.mal
        monetdb5/modules/mal/Tests/callfunction.stable.err
        monetdb5/modules/mal/Tests/callfunction.stable.out
        monetdb5/modules/mal/Tests/callstring.mal
        monetdb5/modules/mal/Tests/callstring.stable.err
        monetdb5/modules/mal/Tests/callstring.stable.out
        monetdb5/modules/mal/Tests/cpustat.mal
        monetdb5/modules/mal/Tests/pqueue.mal
        monetdb5/modules/mal/Tests/pqueue.stable.err
        monetdb5/modules/mal/Tests/pqueue.stable.out
        monetdb5/modules/mal/querylog.c
        monetdb5/modules/mal/querylog.h
        monetdb5/modules/mal/querylog.mal
        monetdb5/modules/mal/sysmon.c
        monetdb5/modules/mal/sysmon.h
        monetdb5/modules/mal/sysmon.mal
        monetdb5/optimizer/Tests/dataflow4.mal
        monetdb5/optimizer/Tests/dataflow4.stable.err
        monetdb5/optimizer/Tests/dataflow4.stable.out
        monetdb5/optimizer/Tests/dataflow5.mal
        monetdb5/optimizer/Tests/dataflow5.stable.err
        monetdb5/optimizer/Tests/dataflow5.stable.out
        monetdb5/optimizer/Tests/inlineFunction1.mal
        monetdb5/optimizer/Tests/inlineFunction1.stable.err
        monetdb5/optimizer/Tests/inlineFunction1.stable.out
        monetdb5/optimizer/Tests/inlineFunction3.mal
        monetdb5/optimizer/Tests/inlineFunction3.stable.err
        monetdb5/optimizer/Tests/inlineFunction3.stable.out
        monetdb5/optimizer/Tests/inlineFunction4.mal
        monetdb5/optimizer/Tests/inlineFunction4.stable.err
        monetdb5/optimizer/Tests/inlineFunction4.stable.out
        monetdb5/optimizer/opt_querylog.c
        monetdb5/optimizer/opt_querylog.h
        monetdb5/scheduler/Tests/mutation00.mal
        monetdb5/scheduler/Tests/mutation00.stable.err
        monetdb5/scheduler/Tests/mutation00.stable.out
        sql/scripts/15_querylog.sql
        sql/scripts/26_sysmon.sql
        sql/server/rel_planner.c
        sql/server/rel_planner.h
        
sql/test/BugTracker-2009/Tests/multi-column_join_with_expression.SF-2783279.sql
        sql/test/BugTracker-2009/Tests/overflow.SF-2853458.stable.err.Solaris
        sql/test/BugTracker-2009/Tests/overflow.SF-2853458.stable.out.Solaris
        sql/test/BugTracker-2013/Tests/aggregates-typing-issues.Bug-3277.sql
        
sql/test/BugTracker-2013/Tests/aggregates-typing-issues.Bug-3277.stable.err
        
sql/test/BugTracker-2013/Tests/aggregates-typing-issues.Bug-3277.stable.out
        sql/test/BugTracker-2013/Tests/between.Bug-3259.sql
        sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.err
        sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out
        sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.single
        sql/test/BugTracker-2013/Tests/copy-into-decimal.Bug-3265.sql
        sql/test/BugTracker-2013/Tests/copy-into-decimal.Bug-3265.stable.err
        sql/test/BugTracker-2013/Tests/copy-into-decimal.Bug-3265.stable.out
        sql/test/BugTracker-2013/Tests/correlated_select.Bug-3250.sql
        sql/test/BugTracker-2013/Tests/correlated_select.Bug-3250.stable.err
        sql/test/BugTracker-2013/Tests/correlated_select.Bug-3250.stable.out
        sql/test/BugTracker-2013/Tests/corrupt-after-restart.Bug-3282.py
        sql/test/BugTracker-2013/Tests/corrupt-after-restart.Bug-3282.stable.err
        sql/test/BugTracker-2013/Tests/corrupt-after-restart.Bug-3282.stable.out
        sql/test/BugTracker-2013/Tests/crash-from-optimizer.Bug-3241.sql
        sql/test/BugTracker-2013/Tests/crash-from-optimizer.Bug-3241.stable.err
        sql/test/BugTracker-2013/Tests/crash-from-optimizer.Bug-3241.stable.out
        sql/test/BugTracker-2013/Tests/create_table_with_func.Bug-3286.sql
        
sql/test/BugTracker-2013/Tests/create_table_with_func.Bug-3286.stable.err
        
sql/test/BugTracker-2013/Tests/create_table_with_func.Bug-3286.stable.out
        sql/test/BugTracker-2013/Tests/db_users.Bug-3287.sql
        sql/test/BugTracker-2013/Tests/db_users.Bug-3287.stable.err
        sql/test/BugTracker-2013/Tests/db_users.Bug-3287.stable.out
        sql/test/BugTracker-2013/Tests/empty-strings.Bug-3261.SQL.py
        sql/test/BugTracker-2013/Tests/empty-strings.Bug-3261.stable.err
        sql/test/BugTracker-2013/Tests/empty-strings.Bug-3261.stable.out
        sql/test/BugTracker-2013/Tests/groupby_on_value_view.Bug-3264.sql
        sql/test/BugTracker-2013/Tests/groupby_on_value_view.Bug-3264.stable.err
        sql/test/BugTracker-2013/Tests/groupby_on_value_view.Bug-3264.stable.out
        sql/test/BugTracker-2013/Tests/median-null.Bug-3280.sql
        sql/test/BugTracker-2013/Tests/median-null.Bug-3280.stable.err
        sql/test/BugTracker-2013/Tests/median-null.Bug-3280.stable.out
        sql/test/BugTracker-2013/Tests/numeric-column-alias.Bug-3279.sql
        sql/test/BugTracker-2013/Tests/numeric-column-alias.Bug-3279.stable.err
        sql/test/BugTracker-2013/Tests/numeric-column-alias.Bug-3279.stable.out
        sql/test/BugTracker-2013/Tests/numeric-column-orderby.Bug-3278.sql
        
sql/test/BugTracker-2013/Tests/numeric-column-orderby.Bug-3278.stable.err
        
sql/test/BugTracker-2013/Tests/numeric-column-orderby.Bug-3278.stable.out
        sql/test/BugTracker-2013/Tests/oid_handling.sql
        sql/test/BugTracker-2013/Tests/oid_handling.stable.err
        sql/test/BugTracker-2013/Tests/oid_handling.stable.out
        sql/test/BugTracker-2013/Tests/perl-undef-0.Bug-3235.SQL.bat
        sql/test/BugTracker-2013/Tests/perl-undef-0.Bug-3235.SQL.sh
        sql/test/BugTracker-2013/Tests/perl-undef-0.Bug-3235.pl
        sql/test/BugTracker-2013/Tests/perl-undef-0.Bug-3235.stable.err
        sql/test/BugTracker-2013/Tests/perl-undef-0.Bug-3235.stable.out
        sql/test/BugTracker-2013/Tests/select-view-view.Bug-3245.sql
        sql/test/BugTracker-2013/Tests/select-view-view.Bug-3245.stable.err
        sql/test/BugTracker-2013/Tests/select-view-view.Bug-3245.stable.out
        sql/test/BugTracker-2013/Tests/stddev-group.Bug-3257.sql
        sql/test/BugTracker-2013/Tests/stddev-group.Bug-3257.stable.err
        sql/test/BugTracker-2013/Tests/stddev-group.Bug-3257.stable.out
        sql/test/BugTracker-2013/Tests/subtract-one-year.Bug-3215.sql
        sql/test/BugTracker-2013/Tests/subtract-one-year.Bug-3215.stable.err
        sql/test/BugTracker-2013/Tests/subtract-one-year.Bug-3215.stable.out
        sql/test/Tests/setoptimizer.stable.out.Windows
        sql/test/Users/Tests/privs.sql.src
        sql/test/Users/Tests/privs.stable.err
        sql/test/Users/Tests/privs.stable.out
        sql/test/Users/Tests/privs2.sql.src
        sql/test/Users/Tests/privs2.stable.err
        sql/test/Users/Tests/privs2.stable.out
        sql/test/Users/Tests/test_privs2_p1.SQL.py
        sql/test/Users/Tests/test_privs2_p1.stable.err
        sql/test/Users/Tests/test_privs2_p1.stable.out
        sql/test/Users/Tests/test_privs2_p2.SQL.py
        sql/test/Users/Tests/test_privs2_p2.stable.err
        sql/test/Users/Tests/test_privs2_p2.stable.out
        sql/test/Users/Tests/test_privs_p1.SQL.py
        sql/test/Users/Tests/test_privs_p1.stable.err
        sql/test/Users/Tests/test_privs_p1.stable.out
        sql/test/Users/Tests/test_privs_p2.SQL.py
        sql/test/Users/Tests/test_privs_p2.stable.err
        sql/test/Users/Tests/test_privs_p2.stable.out
        sql/test/Users/privs.sql
        sql/test/Users/privs2.sql
        sql/test/Users/test_privs.sql
        sql/test/Users/test_privs2.sql
        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
        sql/test/bugs/Tests/polymorphism.stable.err
        sql/test/bugs/Tests/polymorphism.stable.out
        sql/test/centipede/Tests/All
        sql/test/centipede/Tests/olap.sql
Removed Files:
        buildtools/ChangeLog.Oct2012
        clients/ChangeLog.Oct2012
        debian/libmonetdb8.install
        gdk/ChangeLog.Oct2012
        geom/ChangeLog.Oct2012
        java/ChangeLog.Oct2012
        monetdb5/ChangeLog.Oct2012
        monetdb5/modules/kernel/group.mx
        monetdb5/optimizer/opt_history.c
        monetdb5/optimizer/opt_history.h
        sql/ChangeLog.Oct2012
        sql/scripts/15_history.sql
        
sql/test/BugTracker-2009/Tests/multi-column_join_with_expression.SF-2783279.csv
        
sql/test/BugTracker-2009/Tests/multi-column_join_with_expression.SF-2783279.sql.in
        sql/test/BugTracker-2009/Tests/overflow.SF-2853458.stable.err.SunOS
        sql/test/BugTracker-2009/Tests/overflow.SF-2853458.stable.out.SunOS
        sql/test/concurrent/Tests/crash_on_concurrent_use.SF-1411926.sql
        testing/ChangeLog.Oct2012
        testing/subprocess26.py
        tools/merovingian/ChangeLog.Oct2012
Modified Files:
        .hgtags
        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
        README
        buildtools/autogen/autogen/msc.py
        clients/ChangeLog-Archive
        clients/ChangeLog.Feb2013
        clients/Tests/exports.stable.out
        clients/mapiclient/Tests/tomograph--help.stable.err
        clients/mapiclient/mclient.c
        clients/mapiclient/tomograph.c
        clients/mapilib/mapi.c
        clients/mapilib/mapi.rc
        clients/odbc/driver/driver.rc
        clients/odbc/winsetup/setup.rc
        clients/perl/MonetDB-CLI-MapiPP/MonetDB/CLI/MapiPP.pm
        clients/php/doc/generate_doc.sh
        clients/php/examples/query.php
        clients/python2/monetdb/__init__.py
        clients/python2/monetdb/control.py
        clients/python2/monetdb/exceptions.py
        clients/python2/monetdb/mapi.py
        clients/python2/monetdb/sql/__init__.py
        clients/python2/monetdb/sql/connections.py
        clients/python2/monetdb/sql/converters.py
        clients/python2/monetdb/sql/cursors.py
        clients/python2/monetdb/sql/monetize.py
        clients/python2/monetdb/sql/pythonize.py
        clients/python2/monetdb/sql/types.py
        clients/python2/setup.py
        clients/python2/test/capabilities.py
        clients/python2/test/control.py
        clients/python2/test/dbapi20.py
        clients/python2/test/run.sh
        clients/python2/test/runtests.py
        clients/python2/test/test_control.py
        clients/python3/monetdb/__init__.py
        clients/python3/monetdb/control.py
        clients/python3/monetdb/exceptions.py
        clients/python3/monetdb/mapi.py
        clients/python3/monetdb/sql/__init__.py
        clients/python3/monetdb/sql/connections.py
        clients/python3/monetdb/sql/converters.py
        clients/python3/monetdb/sql/cursors.py
        clients/python3/monetdb/sql/monetize.py
        clients/python3/monetdb/sql/pythonize.py
        clients/python3/monetdb/sql/types.py
        clients/python3/setup.py
        clients/python3/test/capabilities.py
        clients/python3/test/dbapi20.py
        clients/python3/test/run.sh
        clients/python3/test/runtests.py
        clients/python3/test/test_control.py
        clients/ruby/lib/MonetDBExceptions.rb
        common/stream/stream.c
        common/stream/stream.h
        common/utils/msabaoth.c
        configure.ag
        debian/changelog
        debian/control
        debian/monetdb-client.install
        debian/monetdb5-sql.default
        debian/monetdb5-sql.init.d
        debian/monetdb5-sql.install
        debian/rules
        gdk/ChangeLog-Archive
        gdk/ChangeLog.Feb2013
        gdk/Makefile.ag
        gdk/gdk.h
        gdk/gdk_aggr.c
        gdk/gdk_align.c
        gdk/gdk_atomic.h
        gdk/gdk_atoms.c
        gdk/gdk_bat.c
        gdk/gdk_batop.c
        gdk/gdk_bbp.c
        gdk/gdk_calc.c
        gdk/gdk_calc.h
        gdk/gdk_calc_compare.h
        gdk/gdk_calc_private.h
        gdk/gdk_group.c
        gdk/gdk_heap.c
        gdk/gdk_imprints.c
        gdk/gdk_logger.c
        gdk/gdk_mapreduce.c
        gdk/gdk_posix.c
        gdk/gdk_private.h
        gdk/gdk_relop.mx
        gdk/gdk_sample.c
        gdk/gdk_search.c
        gdk/gdk_search.h
        gdk/gdk_select.c
        gdk/gdk_setop.mx
        gdk/gdk_storage.c
        gdk/gdk_system.c
        gdk/gdk_system.h
        gdk/gdk_utils.c
        gdk/gdk_value.c
        gdk/libbat.rc
        geom/monetdb5/geom.c
        java/ChangeLog-Archive
        java/ChangeLog.Feb2013
        java/Makefile.ag
        java/build.properties
        java/build.xml
        java/pom.xml
        java/release.txt
        java/src/nl/cwi/monetdb/jdbc/MonetPreparedStatement.java
        java/tests/Test_PStypes.java
        libversions
        monetdb5/ChangeLog-Archive
        monetdb5/ChangeLog.Feb2013
        monetdb5/extras/jaql/Tests/join00.stable.out
        monetdb5/extras/jaql/Tests/join01.stable.out
        monetdb5/extras/jaql/Tests/join02.stable.out
        monetdb5/extras/jaql/jaqlgencode.c
        monetdb5/extras/jaql/jaqlscenario.c
        monetdb5/extras/jaql/jaqltests/Tests/join.stable.out
        monetdb5/extras/jaql/json.c
        monetdb5/extras/jaql/parser/Makefile.ag
        monetdb5/extras/jaql/parser/jaql.l
        monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
        monetdb5/extras/rdf/rdf_shredder.mx
        monetdb5/mal/Tests/All
        monetdb5/mal/Tests/performanceTests/performanceLog
        monetdb5/mal/Tests/tst019.stable.out
        monetdb5/mal/Tests/tst034.stable.out
        monetdb5/mal/Tests/tst1500.mal
        monetdb5/mal/Tests/tst1500.stable.out
        monetdb5/mal/Tests/tst1503.mal
        monetdb5/mal/Tests/tst1503.stable.out
        monetdb5/mal/Tests/tst274.stable.out.oid64
        monetdb5/mal/Tests/tst870.mal
        monetdb5/mal/Tests/tst870.stable.out
        monetdb5/mal/mal.c
        monetdb5/mal/mal.h
        monetdb5/mal/mal_authorize.c
        monetdb5/mal/mal_box.c
        monetdb5/mal/mal_client.c
        monetdb5/mal/mal_client.h
        monetdb5/mal/mal_dataflow.c
        monetdb5/mal/mal_dataflow.h
        monetdb5/mal/mal_debugger.c
        monetdb5/mal/mal_debugger.h
        monetdb5/mal/mal_factory.c
        monetdb5/mal/mal_function.c
        monetdb5/mal/mal_instruction.c
        monetdb5/mal/mal_instruction.h
        monetdb5/mal/mal_interpreter.c
        monetdb5/mal/mal_interpreter.h
        monetdb5/mal/mal_module.c
        monetdb5/mal/mal_namespace.c
        monetdb5/mal/mal_parser.c
        monetdb5/mal/mal_profiler.c
        monetdb5/mal/mal_profiler.h
        monetdb5/mal/mal_properties.c
        monetdb5/mal/mal_recycle.c
        monetdb5/mal/mal_resource.c
        monetdb5/mal/mal_resource.h
        monetdb5/mal/mal_runtime.c
        monetdb5/mal/mal_runtime.h
        monetdb5/mal/mal_sabaoth.c
        monetdb5/mal/mal_session.c
        monetdb5/mal/mal_stack.h
        monetdb5/modules/atoms/batxml.c
        monetdb5/modules/atoms/blob.c
        monetdb5/modules/atoms/mtime.c
        monetdb5/modules/atoms/url.c
        monetdb5/modules/kernel/Makefile.ag
        monetdb5/modules/kernel/aggr.c
        monetdb5/modules/kernel/aggr.mal
        monetdb5/modules/kernel/aggr.mal.sh
        monetdb5/modules/kernel/algebra.mx
        monetdb5/modules/kernel/bat5.c
        monetdb5/modules/kernel/batmmath.c
        monetdb5/modules/mal/Makefile.ag
        monetdb5/modules/mal/Tests/All
        monetdb5/modules/mal/Tests/clients01.mal
        monetdb5/modules/mal/Tests/partition.stable.out
        monetdb5/modules/mal/batExtensions.c
        monetdb5/modules/mal/clients.c
        monetdb5/modules/mal/clients.h
        monetdb5/modules/mal/clients.mal
        monetdb5/modules/mal/const.c
        monetdb5/modules/mal/language.c
        monetdb5/modules/mal/language.h
        monetdb5/modules/mal/language.mal
        monetdb5/modules/mal/mal_init.mal
        monetdb5/modules/mal/mal_mapi.c
        monetdb5/modules/mal/mat.c
        monetdb5/modules/mal/mat.h
        monetdb5/modules/mal/mat.mal
        monetdb5/modules/mal/mdb.c
        monetdb5/modules/mal/mdb.h
        monetdb5/modules/mal/mdb.mal
        monetdb5/modules/mal/pcre.c
        monetdb5/modules/mal/pcre.mal
        monetdb5/modules/mal/pqueue.c
        monetdb5/modules/mal/profiler.c
        monetdb5/modules/mal/profiler.h
        monetdb5/modules/mal/profiler.mal
        monetdb5/modules/mal/recycle.c
        monetdb5/modules/mal/remote.c
        monetdb5/modules/mal/tablet.c
        monetdb5/optimizer/Makefile.ag
        monetdb5/optimizer/Tests/All
        monetdb5/optimizer/Tests/cst01.mal
        monetdb5/optimizer/Tests/cst01.stable.out
        monetdb5/optimizer/Tests/dataflow3.mal
        monetdb5/optimizer/Tests/dataflow3.stable.out
        monetdb5/optimizer/Tests/ifthencst.stable.out
        monetdb5/optimizer/Tests/inlineFunction.mal
        monetdb5/optimizer/Tests/inlineFunction.stable.out
        monetdb5/optimizer/Tests/inlineFunction2.mal
        monetdb5/optimizer/Tests/inlineFunction2.stable.out
        monetdb5/optimizer/Tests/joinpath.mal
        monetdb5/optimizer/Tests/joinpath.stable.out
        monetdb5/optimizer/Tests/tst4631.stable.out
        monetdb5/optimizer/Tests/tst4730.stable.out
        monetdb5/optimizer/opt_centipede.c
        monetdb5/optimizer/opt_dataflow.c
        monetdb5/optimizer/opt_dictionary.c
        monetdb5/optimizer/opt_evaluate.c
        monetdb5/optimizer/opt_joinpath.c
        monetdb5/optimizer/opt_matpack.c
        monetdb5/optimizer/opt_mergetable.c
        monetdb5/optimizer/opt_mitosis.c
        monetdb5/optimizer/opt_origin.c
        monetdb5/optimizer/opt_pipes.c
        monetdb5/optimizer/opt_prelude.c
        monetdb5/optimizer/opt_prelude.h
        monetdb5/optimizer/opt_pushselect.c
        monetdb5/optimizer/opt_support.c
        monetdb5/optimizer/opt_wrapper.c
        monetdb5/optimizer/optimizer.mal
        monetdb5/scheduler/Tests/All
        monetdb5/tests/BugDay_2005-10-06_4.8/Tests/print_CTgroup.SF-1315791.mal
        
monetdb5/tests/BugDay_2005-10-06_4.8/Tests/print_CTgroup.SF-1315791.stable.out
        monetdb5/tests/BugDay_2005-10-06_4.9.3/Tests/All
        monetdb5/tools/Tests/mserver5--help.stable.err
        monetdb5/tools/libmonetdb5.rc
        sql/ChangeLog-Archive
        sql/ChangeLog.Feb2013
        sql/backends/monet5/Makefile.ag
        sql/backends/monet5/Tests/optimizers.stable.out
        sql/backends/monet5/UDF/Tests/udf-fuse.stable.out
        sql/backends/monet5/UDF/Tests/udf-reverse.stable.out
        sql/backends/monet5/datacell/actuator.c
        sql/backends/monet5/datacell/basket.c
        sql/backends/monet5/datacell/opt_datacell.h
        sql/backends/monet5/datacell/receptor.c
        sql/backends/monet5/rel_bin.c
        sql/backends/monet5/sql.mx
        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_user.c
        sql/backends/monet5/vaults/fits.c
        sql/backends/monet5/vaults/mseed.c
        sql/common/sql_backend.c
        sql/common/sql_backend.h
        sql/common/sql_hash.c
        sql/common/sql_list.c
        sql/common/sql_mem.c
        sql/common/sql_types.c
        sql/common/sql_types.h
        sql/include/sql_catalog.h
        sql/jdbc/tests/Tests/Test_Dobjects.stable.out
        sql/jdbc/tests/Tests/Test_JdbcClient.stable.out
        sql/scripts/16_tracelog.sql
        sql/scripts/22_clients.sql
        sql/scripts/25_debug.sql
        sql/scripts/30_rdf.sql
        sql/scripts/39_analytics.sql
        sql/scripts/75_storagemodel.sql
        sql/scripts/Makefile.ag
        sql/server/Makefile.ag
        sql/server/rel_dump.c
        sql/server/rel_dump.h
        sql/server/rel_optimizer.c
        sql/server/rel_optimizer.h
        sql/server/rel_psm.c
        sql/server/rel_schema.c
        sql/server/rel_select.c
        sql/server/rel_updates.c
        sql/server/sql_atom.c
        sql/server/sql_env.c
        sql/server/sql_env.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/server/sql_scan.h
        sql/server/sql_semantic.h
        sql/storage/Makefile.ag
        sql/storage/bat/bat_storage.c
        sql/storage/bat/bat_storage.h
        sql/storage/bat/bat_table.c
        sql/storage/bat/bat_table.h
        sql/storage/bat/bat_utils.c
        sql/storage/bat/bat_utils.h
        sql/storage/sql_catalog.c
        sql/storage/sql_storage.h
        sql/storage/store.c
        sql/test/ADT2006/Tests/bram.stable.out
        sql/test/BugConstraints/Tests/add_constraint_1643522.stable.err
        sql/test/BugConstraints/Tests/add_constraint_1643522.stable.out
        sql/test/BugConstraints/Tests/delete_primarykey_1643845.stable.err
        sql/test/BugConstraints/Tests/drop_column_1643542.stable.err
        sql/test/BugConstraints/Tests/update_primarykey_1643375.stable.err
        
sql/test/BugDay_2005-10-06_2.8/Tests/MapiClient-dump.SF-905851.stable.out
        sql/test/BugDay_2005-10-06_2.8/Tests/string_quotes.SF-919539.stable.out
        
sql/test/BugDay_2005-10-06_2.9.3/Tests/UNION_JOIN_vs_plain_set_UNION-2.SF-920585.stable.out
        
sql/test/BugDay_2005-10-06_2.9.3/Tests/basic_arithmetics.SF-922252.stable.out
        sql/test/BugDay_2005-10-06_2.9.3/Tests/case.SF-929151.stable.out
        
sql/test/BugDay_2005-10-06_2.9.3/Tests/jdbc_crashes_on_getTables.SF_944316.stable.out
        
sql/test/BugDay_2005-10-06_2.9.3/Tests/last_line_without_newline.SF-922390_s02.sql
        
sql/test/BugDay_2005-10-06_2.9.3/Tests/simple_union.SF-1005596.stable.out
        
sql/test/BugDay_2005-10-06_2.9.3/Tests/variable_arg_substring.SF_942981.stable.out
        sql/test/BugDay_2005-11-09_2.8/Tests/crash_in_case.SF-1097749.stable.out
        
sql/test/BugDay_2005-11-09_2.9.3/Tests/sql_server_crash.SF-1080024.stable.out
        
sql/test/BugDay_2005-11-09_2.9.3/Tests/union-duplicates.SF-1119186.stable.out
        
sql/test/BugTracker-2008/Tests/sql_command_kills_db.SF-2233677.stable.err
        sql/test/BugTracker-2009/Tests/AVG_ReturnsNoLines.SF-2596084.stable.out
        sql/test/BugTracker-2009/Tests/AVG_of_SQRT.SF-2757642.stable.out
        sql/test/BugTracker-2009/Tests/All
        sql/test/BugTracker-2009/Tests/IS_NULL_in_CASE.stable.out
        sql/test/BugTracker-2009/Tests/POWER_vs_prod.SF-2596114.stable.out
        
sql/test/BugTracker-2009/Tests/dumping_tables.SF-2776908--optimizers.stable.out
        
sql/test/BugTracker-2009/Tests/dumping_tables.SF-2776908--performance.stable.out
        sql/test/BugTracker-2009/Tests/dumping_tables.SF-2776908.stable.out
        sql/test/BugTracker-2009/Tests/group_by_on_values.SF-2837561.stable.out
        sql/test/BugTracker-2009/Tests/mclient-lsql-D.stable.out
        
sql/test/BugTracker-2009/Tests/name_clash_with_dump.SF-2780395.stable.out
        sql/test/BugTracker-2009/Tests/not_equal.SF-2678502.stable.out
        
sql/test/BugTracker-2009/Tests/old_views_incorrectly_reused.SF-2863804.stable.out
        sql/test/BugTracker-2009/Tests/push_select_down_crash.stable.out
        sql/test/BugTracker-2009/Tests/reorder.SF-2770608.sql
        sql/test/BugTracker-2009/Tests/table-leftovers.SF-2779462.sql
        sql/test/BugTracker-2009/Tests/union_leak.SF-2540169.3.sql
        
sql/test/BugTracker-2009/Tests/use_order_column_first.SF-2686008.stable.out
        sql/test/BugTracker-2009/Tests/utf8_bug.SF-2822855.stable.out
        
sql/test/BugTracker-2010/Tests/LIMIT_OFFSET_big-endian.Bug-2622.stable.out
        
sql/test/BugTracker-2010/Tests/ORDER_BY_over_UNION_EXCEPT_INTERSECT.Bug-2606.stable.out
        sql/test/BugTracker-2010/Tests/crash_on_where_in.Bug-2333.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/order_by_on_single_row_view.SF-2950453.stable.out
        
sql/test/BugTracker-2010/Tests/substring_display_width.Bug-2683.stable.out
        sql/test/BugTracker-2011/Tests/aggregate-in-subquery.Bug-2739.stable.out
        sql/test/BugTracker-2011/Tests/case-when-alias.Bug-2848.stable.out
        sql/test/BugTracker-2011/Tests/copy-into-file-error.Bug-2722.stable.out
        sql/test/BugTracker-2011/Tests/count-count-distinct.Bug-2808.stable.out
        sql/test/BugTracker-2011/Tests/exists-select.Bug-2933.stable.out
        sql/test/BugTracker-2011/Tests/func_iter_vs_bulk.Bug-2826.stable.out
        
sql/test/BugTracker-2011/Tests/interrupted-initialization.Bug-2875.stable.out
        sql/test/BugTracker-2011/Tests/mclient-lsql-d.Bug-2861.stable.out
        sql/test/BugTracker-2011/Tests/perl-table_info.Bug-2885.pl
        
sql/test/BugTracker-2011/Tests/view_avg_incorrect_result.Bug-2790.stable.out
        
sql/test/BugTracker-2012/Tests/aggregate_vs_positional_column_crash.Bug-3085.stable.out
        sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.err
        sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.out
        
sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090_nogeom.stable.err
        
sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090_nogeom.stable.out
        
sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out
        
sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-0.Bug-3063.stable.out
        
sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-1.Bug-3063.stable.out
        sql/test/BugTracker-2013/Tests/All
        sql/test/BugTracker-2013/Tests/php-size-limit-bug.php
        
sql/test/BugTracker/Tests/assert_fails_on_algebra_version.SF-2019349.stable.out
        sql/test/BugTracker/Tests/bind_with_cast.SF-1720934.stable.err
        sql/test/BugTracker/Tests/cardinality_violation.SF-1240701.stable.err
        
sql/test/BugTracker/Tests/cardinality_violation.SF-1240701.stable.err.Windows
        sql/test/BugTracker/Tests/crash_on_delete.SF-1639108.stable.out
        sql/test/BugTracker/Tests/crash_on_delete.SF-1651567.stable.out
        sql/test/BugTracker/Tests/crash_on_insert.SF-1639113.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/BugTracker/Tests/multi-column-constraint.SF-1964587.stable.out
        sql/test/BugTracker/Tests/rank_over.SF-1691098.stable.out
        
sql/test/BugTracker/Tests/set_sql_debug_64__breaking_the_DB.SF-1906287.stable.out
        sql/test/BugTracker/Tests/with_only_once.SF-1720293.stable.out
        sql/test/Dependencies/Tests/Dependencies.stable.err
        sql/test/Dependencies/Tests/Dependencies.stable.out
        sql/test/Dependencies/Tests/dependency_loop.stable.out
        sql/test/DropCascade/Tests/drop_columns_cascade.stable.out
        sql/test/DropCascade/Tests/drop_pkey_cascade.stable.out
        sql/test/Dump/Tests/dump-empty.stable.out
        sql/test/Dump/Tests/dump.stable.out
        sql/test/Dump/Tests/dump.stable.out.Windows
        sql/test/Skyserver/Tests/Skyserver.stable.out
        sql/test/Tests/coalesce.stable.out
        sql/test/Tests/keys.stable.out
        sql/test/Tests/order_by_complex_exp.stable.out
        sql/test/Tests/setoptimizer.stable.err
        sql/test/Tests/setoptimizer.stable.out
        sql/test/Tests/systemfunctions.stable.out
        sql/test/Tests/systemfunctions_nogeom.stable.out
        sql/test/Tests/trace.stable.out
        sql/test/Tests/trace_nogeom.stable.out
        sql/test/Triggers/Tests/recursive_triggers.stable.err
        sql/test/UserDump/Tests/create.stable.out
        sql/test/Users/Tests/All
        sql/test/VOC/Tests/VOC.stable.out
        sql/test/bugs/Tests/All
        sql/test/bugs/Tests/crash_order_by.stable.out
        sql/test/bugs/Tests/groupby_having_charlength-bug-sf-943566.stable.out
        sql/test/bugs/Tests/insert_delete-bug-sf-904025.stable.out
        sql/test/bugs/Tests/select_from_values.stable.out
        sql/test/bugs/Tests/simple_view.stable.out
        
sql/test/bugs/Tests/subselect_multiple_unionall_where_1=1-bug-sf-1005596.stable.out
        sql/test/bugs/Tests/subselect_single_value-bug-sf-941791.stable.out
        sql/test/bugs/Tests/subselect_union-bug-sf-941826.stable.out
        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/Tests/union_all-bug-sf-941788.stable.out
        sql/test/bugs/Tests/union_all_where_1=1-bug-sf-936386.stable.out
        sql/test/bugs/union_all_where_1=1-bug-sf-936386.sql
        sql/test/concurrent/Tests/crash_on_concurrent_use.SF-1411926.SQL.py
        sql/test/concurrent/Tests/crash_on_concurrent_use.SF-1411926.stable.out
        sql/test/leaks/Tests/check0.stable.out
        sql/test/leaks/Tests/check0_nogeom.stable.out
        sql/test/leaks/Tests/check1.stable.out
        sql/test/leaks/Tests/check1_nogeom.stable.out
        sql/test/leaks/Tests/check2.stable.out
        sql/test/leaks/Tests/check2_nogeom.stable.out
        sql/test/leaks/Tests/check3.stable.out
        sql/test/leaks/Tests/check3_nogeom.stable.out
        sql/test/leaks/Tests/check4.stable.out
        sql/test/leaks/Tests/check4_nogeom.stable.out
        sql/test/leaks/Tests/check5.stable.out
        sql/test/leaks/Tests/check5_nogeom.stable.out
        sql/test/leaks/Tests/drop3.stable.out
        sql/test/leaks/Tests/drop3_nogeom.stable.out
        sql/test/leaks/Tests/select1.stable.out
        sql/test/leaks/Tests/select1_nogeom.stable.out
        sql/test/leaks/Tests/select2.stable.out
        sql/test/leaks/Tests/select2_nogeom.stable.out
        sql/test/leaks/Tests/temp1.stable.out
        sql/test/leaks/Tests/temp1_nogeom.stable.out
        sql/test/leaks/Tests/temp2.stable.out
        sql/test/leaks/Tests/temp2_nogeom.stable.out
        sql/test/leaks/Tests/temp3.stable.out
        sql/test/leaks/Tests/temp3_nogeom.stable.out
        sql/test/mapi/Tests/php_monetdb.stable.out
        sql/test/mapi/Tests/php_monetdb_nogeom.stable.out
        sql/test/mapi/Tests/python2_test_monetdb_sql.stable.err
        sql/test/mapi/Tests/python3_test_monetdb_sql.stable.err
        
sql/test/mserver5-sql-readonly/Tests/mserver5-sql-readonly-table.stable.err
        sql/test/pg_regress/Tests/char.stable.out
        sql/test/pg_regress/Tests/strings_concat.stable.out
        sql/test/pg_regress/Tests/text.stable.out
        sql/test/pg_regress/Tests/varchar.stable.out
        sql/test/pg_regress/sql/update.sql
        sql/test/rdf/Tests/q2_28_v.stable.out
        sql/test/rdf/Tests/q2_v.stable.out
        sql/test/rdf/Tests/q3_28_v.stable.out
        sql/test/rdf/Tests/q3_v.stable.out
        sql/test/rdf/Tests/q4_28_v.stable.out
        sql/test/rdf/Tests/q4_v.stable.out
        sql/test/rdf/Tests/q6_28_v.stable.out
        sql/test/rdf/Tests/q6_v.stable.out
        sql/test/setoptimizer.sql
        sql/test/ssqq/Tests/All
        sql/test/ssqq/Tests/insert_query.sql.src
        sql/test/ssqq/Tests/insert_query.stable.out
        sql/test/ssqq/Tests/insert_queue.sql.src
        sql/test/ssqq/Tests/insert_queue.stable.err
        sql/test/ssqq/Tests/insert_queue.stable.out
        sql/test/ssqq/Tests/insert_quser.sql.src
        sql/test/ssqq/Tests/insert_quser.stable.out
        sql/test/ssqq/Tests/ssqq.sql.src
        sql/test/ssqq/insert_query.sql
        sql/test/ssqq/insert_queue.sql
        sql/test/ssqq/insert_quser.sql
        sql/test/ssqq/ssqq.sql
        sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
        sql/test/testdb-upgrade/Tests/upgrade.stable.out
        sql/test/testdb/Tests/testdb-dump.stable.out
        sql/test/testdb/Tests/testdb-dump.stable.out.Windows
        testing/ChangeLog-Archive
        testing/ChangeLog.Feb2013
        testing/Makefile.ag
        testing/Mtest.py.in
        tools/merovingian/ChangeLog-Archive
        tools/merovingian/ChangeLog.Feb2013
        tools/merovingian/client/monetdb.1
        tools/merovingian/client/monetdb.c
        tools/merovingian/utils/control.c
        tools/mserver/mserver5.1
        tools/mserver/mserver5.c
        vertoo.data
Branch: xid
Log Message:

Merge with changeset 47702:64caf95db680 of default branch.


diffs (truncated from 56280 to 300 lines):

diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -513,3 +513,13 @@ 0ef42179e99bbd8450d9993cf419fcbed96cf61c
 14b7be52b2212bf3aeb51edecbaee020554b3158 Oct2012_SP2_release
 0d23123db0a3fd8564564c46789e8e549320c77b Oct2012_9
 1f74df406780bccca94e6128c6c62a0b101fc847 Oct2012_SP3_release
+693187b90b57a610779caa942efe7514372125ee Feb2013_1
+23894afae1679eb37e6866a793ba00782c4b0804 Feb2013_release
+355d0e22cf76c461ba4009d11f84d7bd7349b2a4 Feb2013_3
+fc0c9b319d2275215c283a7ece1d389e55b43217 Feb2013_SP1_release
+0ee398b5025f7bc3c0320d70eb5c0a3707b69c67 mutation_root
+7daa66a6db1c0404dbf7ed935437b59b7bf54d4b Feb2013_5
+df2cbb7845660d94dc484bab860b6893344be92a Feb2013_SP2_release
+cb55e859a50e0d06a50cc9e4f6e377ddea7cc3aa Feb2013_7
+df2cbb7845660d94dc484bab860b6893344be92a Feb2013_SP2_release
+e0139450d66e4fc02c7f5d1d9e6f92fc22d862df Feb2013_SP2_release
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -27,7 +27,7 @@ Vendor: MonetDB BV <[email protected]>
 Group: Applications/Databases
 License: MPL - http://www.monetdb.org/Legal/MonetDBLicense
 URL: http://www.monetdb.org/
-Source: 
http://dev.monetdb.org/downloads/sources/Oct2012-SP3/%{name}-%{version}.tar.bz2
+Source: 
http://dev.monetdb.org/downloads/sources/Feb2013-SP2/%{name}-%{version}.tar.bz2
 
 BuildRequires: bison
 BuildRequires: bzip2-devel
@@ -143,11 +143,28 @@ MonetDB, you will very likely need this 
 %defattr(-,root,root)
 %{_bindir}/mclient
 %{_bindir}/msqldump
-%{_bindir}/stethoscope
 %{_libdir}/libmapi.so.*
 %doc %{_mandir}/man1/mclient.1.gz
 %doc %{_mandir}/man1/msqldump.1.gz
 
+%package client-tools
+Summary: MonetDB - Monet Database Management System Client Programs
+Group: Applications/Databases
+Requires: %{name}-client = %{version}-%{release}
+
+%description client-tools
+MonetDB is a database management system that is developed from a
+main-memory perspective with use of a fully decomposed storage model,
+automatic index management, extensibility of data types and search
+accelerators.  It also has an SQL frontend.
+
+This package contains stethoscope and tomograph.
+
+%files client-tools
+%defattr(-,root,root)
+%{_bindir}/stethoscope
+%{_bindir}/tomograph
+
 %package client-devel
 Summary: MonetDB - Monet Database Management System Client Programs
 Group: Applications/Databases
@@ -688,7 +705,6 @@ mkdir -p $RPM_BUILD_ROOT%{_localstatedir
 # .la files
 rm -f $RPM_BUILD_ROOT%{_libdir}/monetdb5/*.la
 # internal development stuff
-rm -f $RPM_BUILD_ROOT%{_bindir}/calibrator
 rm -f $RPM_BUILD_ROOT%{_bindir}/Maddlog
 rm -f $RPM_BUILD_ROOT%{_libdir}/libbat.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/libbat.so
@@ -706,6 +722,92 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libmonet
 rm -fr $RPM_BUILD_ROOT
 
 %changelog
+* Fri Apr 26 2013 Sjoerd Mullender <[email protected]> - 11.15.7-20130426
+- Rebuilt.
+
+* Sat Apr 13 2013 Niels Nes <[email protected]> - 11.15.7-20130426
+- sql: Added TEMPORARY to the non-reserved keywords, ie no need for double
+  quotes when used as identifier.
+
+* Fri Apr 12 2013 Sjoerd Mullender <[email protected]> - 11.15.5-20130412
+- Rebuilt.
+
+* Thu Apr 11 2013 Sjoerd Mullender <[email protected]> - 11.15.5-20130412
+- java: The pre-compiled .jar files are now created using Java 7 instead of
+  Java 6.
+
+* Mon Apr  8 2013 Sjoerd Mullender <[email protected]> - 11.15.5-20130412
+- gdk: Fixed a bug in case the candidate list is dense and completely
+  outside the range of the bat being worked upon.
+
+* Tue Mar 12 2013 Sjoerd Mullender <[email protected]> - 11.15.5-20130412
+- monetdb5: Fixed argument parsing of mapi.reconnect() with 5 arguments.
+
+* Wed Feb 27 2013 Sjoerd Mullender <[email protected]> - 11.15.3-20130227
+- Rebuilt.
+
+* Tue Feb 12 2013 Sjoerd Mullender <[email protected]> - 11.15.1-20130212
+- Rebuilt.
+
+* Thu Jan 17 2013 Stefan Manegold <[email protected]> - 11.15.1-20130212
+- testing:
+enabled "top-level" Mtest.py
+So far, while Mtest.py could be called in any subdirectory of the MonetDB
+source tree (and could then run all tests in the entire sub-tree),
+it was not possible to call Mtest.py in the top-level MonetDB source
+directory to run all tests.  Instead, to run all tests, Mtest.py had to
+be called at least 4 times, once in each of these directories: "clients",
+"monetdb5", "sql", "geom".
+Now, it is possible to call Mtest.py once in the top-level MonetDB source
+directory to run all tests in one go.
+The behaviour of calling Mtest.py in any subdirectory, including the
+four mentioned above, did not changed, other than that now obsolete
+command line options "-p / --package <package>" and "-5 / --monetdb5"
+have been removed.
+
+* Tue Jan 15 2013 Fabian Groffen <[email protected]> - 11.15.1-20130212
+- clients: Mapi protocol v8 support was removed from all client drivers.  
Protocol
+  v8 has not been used by the servers any more since Apr2012 release
+- clients: The tool mnc was removed from installations
+
+* Tue Jan 15 2013 Fabian Groffen <[email protected]> - 11.15.1-20130212
+- java: merocontrol was changed to return server URIs, and lastStop time.
+  Connections and dbpath were removed.
+- java: Mapi protocol v8 support was removed from MapiSocket.  Protocol
+  v8 has not been used by the servers any more since Apr2012 release
+
+* Tue Jan 15 2013 Fabian Groffen <[email protected]> - 11.15.1-20130212
+- merovingian: Upgrade support for dbfarms from Mar2011 and Aug2011 was dropped
+
+* Tue Jan 15 2013 Fabian Groffen <[email protected]> - 11.15.1-20130212
+- merovingian: monetdb status now uses a more condensed output, to cater for 
the uris
+  being shown, and prints how long a database is stopped, or how long
+  ago it crashed
+
+* Tue Jan 15 2013 Fabian Groffen <[email protected]> - 11.15.1-20130212
+- merovingian: monetdb status now prints the connection uri for each database,
+  when available.  The connections and database path properties have
+  been dropped.
+
+* Tue Jan 15 2013 Fabian Groffen <[email protected]> - 11.15.1-20130212
+- merovingian: monetdb status now prints last crash date only if the database 
has
+  not been started since.
+
+* Tue Jan 15 2013 Sjoerd Mullender <[email protected]> - 11.15.1-20130212
+- monetdb5: mserver5: The --dbname and --dbfarm options have been replaced by 
the
+  single --dbpath option.
+
+* Tue Jan 15 2013 Sjoerd Mullender <[email protected]> - 11.15.1-20130212
+- clients: msqldump: Implmented an option (--table/-t) to dump a single table.
+- clients: Changed msqdump's trace option to be in line with mclient.  In both
+  cases, the long option is --Xdebug and the short option is -X.
+
+* Tue Jan 15 2013 Martin Kersten <[email protected]> - 11.15.1-20130212
+- monetdb5: The scheduler of mserver5 was changed to use a fixed set of 
workers to
+  perform the work for all connected clients.  Previously, each client
+  connection had its own set of workers, easily causing resource problems
+  upon multiple connections to the server.
+
 * Tue Jan 15 2013 Sjoerd Mullender <[email protected]> - 11.13.9-20130115
 - Rebuilt.
 
diff --git a/NT/installer32/MonetDB5-SQL-Installer.vdproj 
b/NT/installer32/MonetDB5-SQL-Installer.vdproj
--- a/NT/installer32/MonetDB5-SQL-Installer.vdproj
+++ b/NT/installer32/MonetDB5-SQL-Installer.vdproj
@@ -231,6 +231,12 @@
         }
         "Entry"
         {
+        "MsmKey" = "8:_399DA9FEC3D14CA1ABCAA84D75F3532E"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
         "MsmKey" = "8:_3B793520B49D47C18CC14D2B737DA38C"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -1721,6 +1727,26 @@
             "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
+            
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_399DA9FEC3D14CA1ABCAA84D75F3532E"
+            {
+            "SourcePath" = "8:lib\\monetdb5\\createdb\\75_storagemodel.sql"
+            "TargetName" = "8:75_storagemodel.sql"
+            "Tag" = "8:"
+            "Folder" = "8:_7F962DDBDF894636B6CAFE6FE4887567"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:FALSE"
+            "IsDependency" = "11:FALSE"
+            "IsolateTo" = "8:"
+            }
             
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_3B793520B49D47C18CC14D2B737DA38C"
             {
             "SourcePath" = "8:lib\\monetdb5\\microbenchmark.mal"
@@ -3603,8 +3629,8 @@
             }
             
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_E13B077DCC48449BBB7679B67C003143"
             {
-            "SourcePath" = "8:lib\\monetdb5\\createdb\\15_history.sql"
-            "TargetName" = "8:15_history.sql"
+            "SourcePath" = "8:lib\\monetdb5\\createdb\\15_querylog.sql"
+            "TargetName" = "8:15_querylog.sql"
             "Tag" = "8:"
             "Folder" = "8:_7F962DDBDF894636B6CAFE6FE4887567"
             "Condition" = "8:"
diff --git a/NT/installer64/MonetDB5-SQL-Installer.vdproj 
b/NT/installer64/MonetDB5-SQL-Installer.vdproj
--- a/NT/installer64/MonetDB5-SQL-Installer.vdproj
+++ b/NT/installer64/MonetDB5-SQL-Installer.vdproj
@@ -369,12 +369,6 @@
         }
         "Entry"
         {
-        "MsmKey" = "8:_FEC2A3A2B0AE4D0990D6AE908F876EE4"
-        "OwnerKey" = "8:_UNDEFINED"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
         "MsmKey" = "8:_6B9091C26D034EFD92BB0864ADB05B61"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -699,6 +693,12 @@
         }
         "Entry"
         {
+        "MsmKey" = "8:_BE5D88D9A25C4ED1A987747ABA28C358"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
         "MsmKey" = "8:_BF77ED0A7E9C49478C26BAF11A3F2C37"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -915,6 +915,12 @@
         }
         "Entry"
         {
+        "MsmKey" = "8:_FEC2A3A2B0AE4D0990D6AE908F876EE4"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
         "MsmKey" = "8:_FF4ED691FBAF49DEA4726DF1C1C90785"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -2063,8 +2069,8 @@
             }
             
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_5F72DF110CF843B188EFA0A1BEB1872C"
             {
-            "SourcePath" = "8:lib\\monetdb5\\createdb\\15_history.sql"
-            "TargetName" = "8:15_history.sql"
+            "SourcePath" = "8:lib\\monetdb5\\createdb\\15_querylog.sql"
+            "TargetName" = "8:15_querylog.sql"
             "Tag" = "8:"
             "Folder" = "8:_7F962DDBDF894636B6CAFE6FE4887567"
             "Condition" = "8:"
@@ -2181,26 +2187,6 @@
             "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
-            
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_FEC2A3A2B0AE4D0990D6AE908F876EE4"
-            {
-            "SourcePath" = "8:lib\\monetdb5\\iterator.mal"
-            "TargetName" = "8:iterator.mal"
-            "Tag" = "8:"
-            "Folder" = "8:_B593DAA0787744D6A44D17884E0C3951"
-            "Condition" = "8:"
-            "Transitive" = "11:FALSE"
-            "Vital" = "11:TRUE"
-            "ReadOnly" = "11:FALSE"
-            "Hidden" = "11:FALSE"
-            "System" = "11:FALSE"
-            "Permanent" = "11:FALSE"
-            "SharedLegacy" = "11:FALSE"
-            "PackageAs" = "3:1"
-            "Register" = "3:1"
-            "Exclude" = "11:FALSE"
-            "IsDependency" = "11:FALSE"
-            "IsolateTo" = "8:"
-            }
             
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_6B9091C26D034EFD92BB0864ADB05B61"
             {
             "SourcePath" = "8:lib\\monetdb5\\json.mal"
@@ -3261,6 +3247,26 @@
             "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
+            
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_BE5D88D9A25C4ED1A987747ABA28C358"
+            {
_______________________________________________
checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list

Reply via email to