Changeset: ec27d9dc8e6e for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ec27d9dc8e6e Added Files: gdk/gdk_atoms.c gdk/gdk_atoms.h gdk/gdk_bat.c gdk/gdk_bat.h gdk/gdk_qsort.c gdk/gdk_qsort_impl.h gdk/gdk_ssort.c gdk/gdk_ssort_impl.h gdk/gdk_utils.c gdk/gdk_utils.h gdk/gdk_value.c monetdb5/extras/jaql/jaqltests/Tests/imenu.json monetdb5/extras/jaql/jaqltests/Tests/shred.jaql.in monetdb5/extras/jaql/jaqltests/Tests/shred.stable.err monetdb5/extras/jaql/jaqltests/Tests/shred.stable.out monetdb5/mal/Tests/tst810.mal monetdb5/mal/Tests/tst810.stable.err monetdb5/mal/Tests/tst810.stable.out monetdb5/mal/mal_debugger.c monetdb5/mal/mal_debugger.h monetdb5/mal/mal_import.c monetdb5/mal/mal_import.h monetdb5/mal/mal_instruction.c monetdb5/mal/mal_instruction.h monetdb5/mal/mal_parser.c monetdb5/mal/mal_parser.h monetdb5/mal/mal_profiler.c monetdb5/mal/mal_profiler.h monetdb5/mal/mal_runtime.c monetdb5/mal/mal_runtime.h sql/test/BugTracker-2012/Tests/cast_varchar_to_double.Bug-3071.sql sql/test/BugTracker-2012/Tests/cast_varchar_to_double.Bug-3071.stable.err sql/test/BugTracker-2012/Tests/cast_varchar_to_double.Bug-3071.stable.out sql/test/BugTracker-2012/Tests/grant_on_qname.Bug-2958.sql sql/test/BugTracker-2012/Tests/grant_on_qname.Bug-2958.stable.err sql/test/BugTracker-2012/Tests/grant_on_qname.Bug-2958.stable.out sql/test/BugTracker-2012/Tests/mal_syntax_error.Bug-2949.sql sql/test/BugTracker-2012/Tests/mal_syntax_error.Bug-2949.stable.err sql/test/BugTracker-2012/Tests/mal_syntax_error.Bug-2949.stable.out sql/test/BugTracker-2012/Tests/name_resolution_in_proc.Bug-3074.sql sql/test/BugTracker-2012/Tests/name_resolution_in_proc.Bug-3074.stable.err sql/test/BugTracker-2012/Tests/name_resolution_in_proc.Bug-3074.stable.out sql/test/BugTracker-2012/Tests/non_keyword_no.Bug-3079.sql sql/test/BugTracker-2012/Tests/non_keyword_no.Bug-3079.stable.err sql/test/BugTracker-2012/Tests/non_keyword_no.Bug-3079.stable.out sql/test/BugTracker-2012/Tests/round-type-inference.Bug-2987.sql sql/test/BugTracker-2012/Tests/round-type-inference.Bug-2987.stable.err sql/test/BugTracker-2012/Tests/round-type-inference.Bug-2987.stable.out sql/test/BugTracker-2012/Tests/segfault_incorrect_head.Bug-3028.sql sql/test/BugTracker-2012/Tests/segfault_incorrect_head.Bug-3028.stable.err sql/test/BugTracker-2012/Tests/segfault_incorrect_head.Bug-3028.stable.out sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-0.Bug-3063.sql sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-0.Bug-3063.stable.err 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.sql sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-1.Bug-3063.stable.err sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-1.Bug-3063.stable.out sql/test/BugTracker-2012/Tests/table_returning_func_returns_too_many_columns.Bug-3077.sql sql/test/BugTracker-2012/Tests/table_returning_func_returns_too_many_columns.Bug-3077.stable.err sql/test/BugTracker-2012/Tests/table_returning_func_returns_too_many_columns.Bug-3077.stable.out sql/test/BugTracker-2012/Tests/user_defined_decimal_function.Bug-2992.sql sql/test/BugTracker-2012/Tests/user_defined_decimal_function.Bug-2992.stable.err sql/test/BugTracker-2012/Tests/user_defined_decimal_function.Bug-2992.stable.out sql/test/Tests/systemfunctions.sql sql/test/Tests/systemfunctions.stable.err sql/test/Tests/systemfunctions.stable.out sql/test/snodgrass/Tests/cast_table.sql sql/test/snodgrass/Tests/cast_table.stable.err sql/test/snodgrass/Tests/cast_table.stable.out sql/test/snodgrass/Tests/date_parsing.sql sql/test/snodgrass/Tests/date_parsing.stable.err sql/test/snodgrass/Tests/date_parsing.stable.out sql/test/snodgrass/Tests/date_select.sql sql/test/snodgrass/Tests/date_select.stable.err sql/test/snodgrass/Tests/date_select.stable.out sql/test/snodgrass/Tests/date_table.sql sql/test/snodgrass/Tests/date_table.stable.err sql/test/snodgrass/Tests/date_table.stable.out sql/test/snodgrass/Tests/extract_select.sql sql/test/snodgrass/Tests/extract_select.stable.err sql/test/snodgrass/Tests/extract_select.stable.out sql/test/snodgrass/Tests/extract_table.sql sql/test/snodgrass/Tests/extract_table.stable.err sql/test/snodgrass/Tests/extract_table.stable.out sql/test/snodgrass/Tests/interval_parsing.sql sql/test/snodgrass/Tests/interval_parsing.stable.err sql/test/snodgrass/Tests/interval_parsing.stable.out sql/test/snodgrass/Tests/interval_select.sql sql/test/snodgrass/Tests/interval_select.stable.err sql/test/snodgrass/Tests/interval_select.stable.out sql/test/snodgrass/Tests/interval_table.sql Removed Files: buildtools/ChangeLog.Dec2011 clients/ChangeLog.Dec2011 gdk/ChangeLog.Dec2011 gdk/gdk_atoms.mx gdk/gdk_bat.mx gdk/gdk_qsort.mx gdk/gdk_ssort.mx gdk/gdk_utils.mx gdk/gdk_value.mx geom/ChangeLog.Dec2011 java/ChangeLog.Dec2011 monetdb5/ChangeLog.Dec2011 monetdb5/mal/mal_debugger.mx monetdb5/mal/mal_import.mx monetdb5/mal/mal_instruction.mx monetdb5/mal/mal_parser.mx monetdb5/mal/mal_profiler.mx monetdb5/mal/mal_syntax.mx monetdb5/modules/kernel/batcast.mx monetdb5/modules/mal/Tests/inspect05.stable.out.Windows sql/ChangeLog.Dec2011 sql/test/snodgrass/cast_table.sql sql/test/snodgrass/date_parsing.sql sql/test/snodgrass/date_select.sql sql/test/snodgrass/date_table.sql sql/test/snodgrass/extract_select.sql sql/test/snodgrass/extract_table.sql sql/test/snodgrass/interval_parsing.sql sql/test/snodgrass/interval_select.sql sql/test/snodgrass/interval_table.sql testing/ChangeLog.Dec2011 tools/merovingian/ChangeLog.Dec2011 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 buildtools/ChangeLog buildtools/ChangeLog.Apr2012 buildtools/autogen/autogen/msc.py buildtools/doc/windowsbuild.rst clients/ChangeLog-Archive clients/ChangeLog.Apr2012 clients/Tests/exports.stable.out clients/mapiclient/mclient.c clients/mapiclient/stethoscope.c clients/mapilib/mapi.rc clients/odbc/driver/driver.rc clients/odbc/winsetup/setup.rc clients/python/setup.py clients/ruby/Makefile.ag clients/ruby/adapter/Makefile.ag common/stream/stream.c configure.ag debian/changelog debian/control debian/monetdb-client-testing.install debian/monetdb5-server.install debian/rules gdk/ChangeLog-Archive gdk/ChangeLog.Apr2012 gdk/Makefile.ag gdk/gdk.h gdk/gdk_align.c gdk/gdk_batop.mx gdk/gdk_bbp.mx gdk/gdk_calc.c gdk/gdk_delta.c gdk/gdk_heap.c gdk/gdk_logger.c gdk/gdk_posix.c gdk/gdk_posix.h gdk/gdk_private.h gdk/gdk_scanselect.mx gdk/gdk_scanselect_defs.mx gdk/gdk_search.mx gdk/gdk_storage.c gdk/gdk_system.c gdk/libbat.rc java/ChangeLog-Archive java/ChangeLog.Apr2012 libversions monetdb5/ChangeLog-Archive monetdb5/ChangeLog.Apr2012 monetdb5/extras/compiler/mal_compiler.c monetdb5/extras/crackers/crackers_joins.mx monetdb5/extras/crackers/crackers_select_ops.mx monetdb5/extras/crackers/crackers_sideways.mx monetdb5/extras/crackers/crackers_sortmerge.mx monetdb5/extras/jaql/Tests/plan01.stable.out monetdb5/extras/jaql/jaql.c monetdb5/extras/jaql/jaql.h monetdb5/extras/jaql/jaqlfunc.mal monetdb5/extras/jaql/jaqlgencode.c monetdb5/extras/jaql/jaqlscenario.c monetdb5/extras/jaql/jaqltests/Tests/All monetdb5/extras/jaql/jaqltree.h monetdb5/extras/jaql/json.c monetdb5/extras/jaql/json.h monetdb5/extras/jaql/json.mal monetdb5/extras/jaql/parser/jaql.l monetdb5/extras/jaql/parser/jaql.y monetdb5/mal/Makefile.ag monetdb5/mal/Tests/All monetdb5/mal/Tests/tst804.stable.out monetdb5/mal/Tests/tst913.mal monetdb5/mal/Tests/tst913.stable.out monetdb5/mal/mal_atom.c monetdb5/mal/mal_builder.c monetdb5/mal/mal_builder.h monetdb5/mal/mal_client.h monetdb5/mal/mal_interpreter.mx monetdb5/mal/mal_recycle.c monetdb5/modules/atoms/url.mx monetdb5/modules/kernel/Makefile.ag monetdb5/modules/kernel/algebra.mx monetdb5/modules/kernel/batcalc.c monetdb5/modules/kernel/batcalc.mal monetdb5/modules/kernel/batcalc.mal.sh monetdb5/modules/kernel/batmtime.mx monetdb5/modules/kernel/group.mx monetdb5/modules/kernel/status.mx monetdb5/modules/mal/Tests/inspect05.mal monetdb5/modules/mal/Tests/inspect05.stable.out monetdb5/modules/mal/mal_init.mal monetdb5/modules/mal/mkey.c monetdb5/optimizer/Tests/GCexample.stable.out monetdb5/optimizer/Tests/tst4800.stable.out monetdb5/optimizer/Tests/tst4900.stable.out monetdb5/optimizer/opt_centipede.mx monetdb5/optimizer/opt_groups.mx monetdb5/optimizer/opt_multiplex.mx monetdb5/optimizer/opt_octopus.mx monetdb5/scheduler/run_memo.c monetdb5/scheduler/run_pipeline.mx monetdb5/tests/BugDay_2005-10-06_4.9.3/Tests/operator_-_vs_sign_-.SF-1120397.stable.out monetdb5/tests/gdkTests/Tests/casts.stable.out monetdb5/tests/gdkTests/Tests/casts.stable.out.SunOS5.10 monetdb5/tests/gdkTests/Tests/casts.stable.out.SunOS5.10.oid64 monetdb5/tests/gdkTests/Tests/casts.stable.out.Windows monetdb5/tests/gdkTests/Tests/casts.stable.out.Windows.64bit.oid64 monetdb5/tests/gdkTests/Tests/casts.stable.out.oid64 monetdb5/tools/libmonetdb5.rc sql/backends/monet5/Makefile.ag sql/backends/monet5/UDF/80_udf.sql sql/backends/monet5/UDF/udf.c sql/backends/monet5/UDF/udf.h sql/backends/monet5/UDF/udf.mal sql/backends/monet5/datacell/50_datacell.mal sql/backends/monet5/datacell/Makefile.ag sql/backends/monet5/datacell/datacell.c sql/backends/monet5/datacell/datacell.mal sql/backends/monet5/sql.mx sql/backends/monet5/sql_gencode.c sql/backends/monet5/sql_optimizer.c sql/backends/monet5/sql_scenario.c sql/common/sql_types.c sql/include/sql_catalog.h sql/server/rel_bin.c sql/server/rel_optimizer.c sql/server/rel_psm.c sql/server/rel_select.c sql/server/sql_parser.y sql/server/sql_rel2bin.c sql/server/sql_statement.c sql/server/sql_statement.h sql/storage/restrict/restrict_storage.c sql/storage/restrict/restrict_table.c sql/storage/store.c sql/test/BugTracker-2009/Tests/AVG_of_SQRT.SF-2757642.stable.out sql/test/BugTracker-2010/Tests/new-readonly-db.Bug-2695.py sql/test/BugTracker-2012/Tests/All sql/test/BugTracker-2012/Tests/bart-crash.Bug-3057.stable.out sql/test/BugTracker-2012/Tests/multiple-arithmetic-operations.Bug-3048.stable.err sql/test/BugTracker-2012/Tests/multiple-arithmetic-operations.Bug-3048.stable.out sql/test/BugTracker-2012/Tests/parent-table-alias.Bug-3047.stable.err sql/test/BugTracker-2012/Tests/parent-table-alias.Bug-3047.stable.out sql/test/BugTracker-2012/Tests/server-crash.Bug-3046.stable.err sql/test/BugTracker-2012/Tests/server-crash.Bug-3046.stable.out sql/test/BugTracker-2012/Tests/set_operation.Bug-3059.stable.err sql/test/BugTracker-2012/Tests/set_operation.Bug-3059.stable.out sql/test/BugTracker-2012/Tests/sticky-precision.Bug-2969.stable.out sql/test/Tests/All sql/test/snodgrass/Tests/All testing/Mfilter.py.in testing/Mtest.py.in tools/merovingian/ChangeLog-Archive tools/merovingian/ChangeLog.Apr2012 vertoo.data Branch: DVframework Log Message:
merged with default. diffs (truncated from 57504 to 300 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -474,3 +474,5 @@ f47248f30989933b245a4d6f2e31a9e443f1078b ab662699300b790a0c20b3c40b6ca0eebf25cd14 Apr2012_root e36693f883f56d50da695471b876542755306736 Dec2011_9 f50d60ffdbeec52cc17a72ecb91eed6753ab403c Dec2011_SP2_release +4702495ed780241f85da16bda9cb8f6bf7cf0a08 Apr2012_1 +62f7cc254c8e83e5021d8230ed5b8e62c3793dd8 Apr2012_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/Dec2011-SP2/%{name}-%{version}.tar.bz2 +Source: http://dev.monetdb.org/downloads/sources/Apr2012/%{name}-%{version}.tar.bz2 BuildRequires: bison BuildRequires: bzip2-devel @@ -48,6 +48,9 @@ BuildRequires: python BuildRequires: readline-devel BuildRequires: ruby BuildRequires: rubygems +%if %{?centos:0}%{!?centos:1} +BuildRequires: rubygems-devel +%endif BuildRequires: unixODBC-devel BuildRequires: zlib-devel @@ -57,8 +60,7 @@ Obsoletes: %{name}-devel %if ! (0%{?fedora} > 12 || 0%{?rhel} > 5) %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} %endif -%{!?ruby_sitelib: %global ruby_sitelib %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"] ')} -%define gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null) +%{!?gem_dir: %global gem_dir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)} %description MonetDB is a database management system that is developed from a @@ -244,13 +246,14 @@ program. %defattr(-,root,root) %{_prefix}/%{perl_libdir}/* -%package client-ruby +%package -n rubygem-monetdb-sql Summary: MonetDB ruby interface Group: Applications/Databases Requires: ruby +Obsoletes: %{name}-client-ruby BuildArch: noarch -%description client-ruby +%description -n rubygem-monetdb-sql 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 @@ -259,18 +262,39 @@ accelerators. It also has an SQL fronte This package contains the files needed to use MonetDB from a Ruby program. -%files client-ruby +%files -n rubygem-monetdb-sql %defattr(-,root,root) -%docdir %{gemdir}/doc/activerecord-monetdb-adapter-0.1 -%docdir %{gemdir}/doc/ruby-monetdb-sql-0.1 -%{gemdir}/doc/activerecord-monetdb-adapter-0.1/* -%{gemdir}/doc/ruby-monetdb-sql-0.1/* -%{gemdir}/cache/*.gem -# %dir %{gemdir}/gems/activerecord-monetdb-adapter-0.1 -# %dir %{gemdir}/gems/ruby-monetdb-sql-0.1 -%{gemdir}/gems/activerecord-monetdb-adapter-0.1 -%{gemdir}/gems/ruby-monetdb-sql-0.1 -%{gemdir}/specifications/*.gemspec +%docdir %{gem_dir}/doc/ruby-monetdb-sql-0.1 +%{gem_dir}/doc/ruby-monetdb-sql-0.1/* +%{gem_dir}/cache/ruby-monetdb-sql-0.1.gem +# %dir %{gem_dir}/gems/ruby-monetdb-sql-0.1 +%{gem_dir}/gems/ruby-monetdb-sql-0.1 +%{gem_dir}/specifications/ruby-monetdb-sql-0.1.gemspec + +%package -n rubygem-activerecord-monetdb-adapter +Summary: MonetDB ruby interface +Group: Applications/Databases +Requires: ruby +Requires: rubygem-activerecord +Requires: rubygem-monetdb-sql +BuildArch: noarch + +%description -n rubygem-activerecord-monetdb-adapter +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 the activerecord adapter for MonetDB. + +%files -n rubygem-activerecord-monetdb-adapter +%defattr(-,root,root) +%docdir %{gem_dir}/doc/activerecord-monetdb-adapter-0.1 +%{gem_dir}/doc/activerecord-monetdb-adapter-0.1/* +%{gem_dir}/cache/activerecord-monetdb-adapter-0.1.gem +# %dir %{gem_dir}/gems/activerecord-monetdb-adapter-0.1 +%{gem_dir}/gems/activerecord-monetdb-adapter-0.1 +%{gem_dir}/specifications/activerecord-monetdb-adapter-0.1.gemspec %package client-tests Summary: MonetDB Client tests package @@ -295,6 +319,7 @@ developer. %files client-tests %defattr(-,root,root) +%{_bindir}/arraytest %{_bindir}/odbcsample1 %{_bindir}/sample0 %{_bindir}/sample1 @@ -388,9 +413,11 @@ fi %exclude %{_libdir}/monetdb5/sql.mal %{_libdir}/monetdb5/*.mal # %{_libdir}/monetdb5/autoload/*_fits.mal +%{_libdir}/monetdb5/autoload/*_jaql.mal +%{_libdir}/monetdb5/autoload/*_lsst.mal +%{_libdir}/monetdb5/autoload/*_opt_sql_append.mal +%{_libdir}/monetdb5/autoload/*_udf.mal %{_libdir}/monetdb5/autoload/*_vault.mal -%{_libdir}/monetdb5/autoload/*_lsst.mal -%{_libdir}/monetdb5/autoload/*_udf.mal %if %{?centos:0}%{!?centos:1} %exclude %{_libdir}/monetdb5/lib_geom.so %endif @@ -564,6 +591,7 @@ developer, but if you do want to test, t --enable-gdk=yes \ --enable-geom=%{?centos:no}%{!?centos:yes} \ --enable-instrument=no \ + --enable-jaql=yes \ --enable-jdbc=no \ --enable-merocontrol=no \ --enable-monetdb5=yes \ @@ -587,6 +615,7 @@ developer, but if you do want to test, t --with-python=yes \ --with-readline=yes \ --with-rubygem=yes \ + --with-rubygem-dir="%{gem_dir}" \ --with-sphinxclient=no \ --with-unixodbc=yes \ --with-valgrind=no \ @@ -626,6 +655,35 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libmonet rm -fr $RPM_BUILD_ROOT %changelog +* Wed Apr 18 2012 Sjoerd Mullender <[email protected]> - 11.9.1-20120418 +- Rebuilt. + +* Mon Mar 12 2012 Fabian Groffen <[email protected]> - 11.9.1-20120418 +- merovingian: The logfile and pidfile monetdbd properties are now displayed with + dbfarm path when relative + +* Mon Mar 12 2012 Sjoerd Mullender <[email protected]> - 11.9.1-20120418 +- clients: ODBC: Implemented the SQL_ATTR_CONNECTION_TIMEOUT attribute. + +* Mon Mar 12 2012 Sjoerd Mullender <[email protected]> - 11.9.1-20120418 +- clients: mclient now has a -a (--autocommit) option to turn off autocommit mode. + +* Mon Mar 12 2012 Wouter Alink <[email protected]> - 11.9.1-20120418 +- java: Password reading by JdbcClient no longer results in strange artifacts +- java: JdbcClient now returns exit code 1 in case of failures + +* Mon Mar 12 2012 Sjoerd Mullender <[email protected]> - 11.9.1-20120418 +- gdk: The type "chr" has been removed. + chr has long been superseded by bte for 1 byte arithmetic plus it is + pretty useless to hold single characters since we use Unicode and + thus only a tiny subset of the supported character set would fit. + +* Mon Mar 12 2012 Sjoerd Mullender <[email protected]> - 11.9.1-20120418 +- monetdb5: The type "chr" has been removed. + chr has long been superseded by bte for 1 byte arithmetic plus it is + pretty useless to hold single characters since we use Unicode and + thus only a tiny subset of the supported character set would fit. + * Mon Mar 12 2012 Fabian Groffen <[email protected]> - 11.7.9-20120312 - 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 @@ -1035,12 +1035,6 @@ } "Entry" { - "MsmKey" = "8:_DDDF62BF89CA4A7EB21FA5D0AF237E95" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_DE011B8A794D4FD9B01C9F53B7BEA736" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -4663,26 +4657,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_DDDF62BF89CA4A7EB21FA5D0AF237E95" - { - "SourcePath" = "8:lib\\monetdb5\\batcast.mal" - "TargetName" = "8:batcast.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}:_DE011B8A794D4FD9B01C9F53B7BEA736" { "SourcePath" = "8:lib\\monetdb5\\opt_joinselect.mal" 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 @@ -1143,12 +1143,6 @@ } "Entry" { - "MsmKey" = "8:_F34CAA830B6541F5B416AA2C43E409F0" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_F49AEE929FA842009A0D617298659436" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -5023,26 +5017,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_F34CAA830B6541F5B416AA2C43E409F0" - { - "SourcePath" = "8:lib\\monetdb5\\batcast.mal" - "TargetName" = "8:batcast.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}:_F49AEE929FA842009A0D617298659436" { "SourcePath" = "8:lib\\monetdb5\\opt_aliases.mal" 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 @@ -171,21 +171,12 @@ /* Define to 1 if you have the `getrlimit' function. */ /* #undef HAVE_GETRLIMIT */ -/* Define to 1 if you have the `GetSystemInfo' function. */ -#define HAVE_GETSYSTEMINFO 1 - /* Define to 1 if you have the `gettimeofday' function. */ /* #undef HAVE_GETTIMEOFDAY */ /* Define to 1 if you have the `getuid' function. */ /* #undef HAVE_GETUID */ -/* Define to 1 if you have the `GlobalMemoryStatus' function. */ -#define HAVE_GLOBALMEMORYSTATUS 1 - -/* Define to 1 if you have the `GlobalMemoryStatusEx' function. */ -#define HAVE_GLOBALMEMORYSTATUSEX 1 /* only on >= NT 5 */ - /* Define if you have the iconv() function and it works. */ /* #undef HAVE_ICONV */ /* optionally defined in rules.msc */ @@ -377,9 +368,6 @@ /* Define to 1 if you have the <pwd.h> header file. */ /* #undef HAVE_PWD_H */ -/* Define to 1 if you have the `QueryPerformanceCounter' function. */ -#define HAVE_QUERYPERFORMANCECOUNTER 1 _______________________________________________ Checkin-list mailing list [email protected] http://mail.monetdb.org/mailman/listinfo/checkin-list
