Changeset: c7372fd93386 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c7372fd93386 Added Files: ChangeLog clients/examples/perl/Makefile.ag clients/examples/perl/client.pl clients/examples/perl/countries.sql clients/examples/perl/dbitest_extensive.pl clients/examples/perl/dbitest_small.pl clients/examples/perl/malsample.pl clients/examples/perl/smack00.pl clients/examples/perl/smack01.pl clients/examples/perl/sqlsample.pl monetdb5/modules/mal/Tests/clients-hashes.stable.out.Darwin Removed Files: clients/perl/DBD/MANIFEST clients/perl/DBD/MANIFEST.SKIP clients/perl/DBD/Makefile.PL clients/perl/DBD/Makefile.ag clients/perl/DBD/README clients/perl/DBD/monetdb.pm clients/perl/DBD/monetdb/GetInfo.pm clients/perl/DBD/monetdb/Makefile.ag clients/perl/DBD/monetdb/TypeInfo.pm clients/perl/DBD/t/01base.t clients/perl/DBD/t/02ads.t clients/perl/DBD/t/02cxn.t clients/perl/DBD/t/05gi.t clients/perl/DBD/t/06ti.t clients/perl/DBD/t/07q.t clients/perl/DBD/t/11prep.t clients/perl/DBD/t/12bind.t clients/perl/DBD/t/12ins_b.t clients/perl/DBD/t/12ins_q.t clients/perl/DBD/t/13count.t clients/perl/DBD/t/14rows.t clients/perl/DBD/t/18bc.t clients/perl/DBD/t/21sth.t clients/perl/DBD/t/23null.t clients/perl/DBD/t/31txn.t clients/perl/DBD/t/41ddtbl.t clients/perl/DBD/t/42ddcol.t clients/perl/DBD/t/43ddpk.t clients/perl/DBD/t/44ddfk.t clients/perl/DBD/t/51qi.t clients/perl/DBD/t/75mil.t clients/perl/DBD/t/DBD_TEST.pm clients/perl/Makefile.ag clients/perl/Mapi.pm clients/perl/MonetDB-CLI-MapiPP/Makefile.ag clients/perl/MonetDB-CLI-MapiPP/MonetDB/CLI/MANIFEST clients/perl/MonetDB-CLI-MapiPP/MonetDB/CLI/MANIFEST.SKIP clients/perl/MonetDB-CLI-MapiPP/MonetDB/CLI/Makefile.PL clients/perl/MonetDB-CLI-MapiPP/MonetDB/CLI/Makefile.ag clients/perl/MonetDB-CLI-MapiPP/MonetDB/CLI/MapiPP.pm clients/perl/MonetDB-CLI-MapiPP/MonetDB/CLI/README clients/perl/MonetDB-CLI-MapiPP/MonetDB/CLI/t/00use.t clients/perl/MonetDB-CLI-MapiPP/MonetDB/CLI/t/02cxn.t clients/perl/MonetDB-CLI-MapiPP/MonetDB/CLI/t/75mil.t clients/perl/MonetDB-CLI-MapiPP/MonetDB/Makefile.ag clients/perl/MonetDB-CLI/Makefile.ag clients/perl/MonetDB-CLI/MonetDB/CLI.pm clients/perl/MonetDB-CLI/MonetDB/MANIFEST clients/perl/MonetDB-CLI/MonetDB/MANIFEST.SKIP clients/perl/MonetDB-CLI/MonetDB/Makefile.PL clients/perl/MonetDB-CLI/MonetDB/Makefile.ag clients/perl/MonetDB-CLI/MonetDB/README clients/perl/MonetDB-CLI/MonetDB/t/00use.t clients/perl/MonetDB-CLI/MonetDB/t/02cxn.t clients/perl/MonetDB-CLI/MonetDB/t/75mil.t clients/perl/Tests/Makefile.ag clients/perl/Tests/client.pl clients/perl/Tests/countries.sql clients/perl/Tests/dbitest_extensive.pl clients/perl/Tests/dbitest_small.pl clients/perl/Tests/malsample.pl.in clients/perl/Tests/smack00.pl clients/perl/Tests/smack01.pl clients/perl/Tests/sqlsample.pl.in clients/perl/mclient.pl debian/perl-monetdb-client.install java/ChangeLog java/ChangeLog-Archive java/ChangeLog.Jun2016 java/Makefile.ag java/SQLSTATEs java/build.properties java/build.xml java/example/MJDBCTest.java java/example/PreparedExample.java java/example/SQLImport.java java/example/SQLcopyinto.java java/pom.xml java/release.txt java/src/main/java/nl/cwi/monetdb/client/JMonetDB.java java/src/main/java/nl/cwi/monetdb/client/JdbcClient.java java/src/main/java/nl/cwi/monetdb/jdbc/MonetBlob.java java/src/main/java/nl/cwi/monetdb/jdbc/MonetClob.java java/src/main/java/nl/cwi/monetdb/jdbc/MonetConnection.java java/src/main/java/nl/cwi/monetdb/jdbc/MonetDataSource.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/MonetPreparedStatement.java java/src/main/java/nl/cwi/monetdb/jdbc/MonetResultSet.java java/src/main/java/nl/cwi/monetdb/jdbc/MonetSavepoint.java java/src/main/java/nl/cwi/monetdb/jdbc/MonetStatement.java java/src/main/java/nl/cwi/monetdb/jdbc/MonetWrapper.java java/src/main/java/nl/cwi/monetdb/jdbc/types/INET.java java/src/main/java/nl/cwi/monetdb/jdbc/types/URL.java java/src/main/java/nl/cwi/monetdb/mcl/MCLException.java java/src/main/java/nl/cwi/monetdb/mcl/io/BufferedMCLReader.java java/src/main/java/nl/cwi/monetdb/mcl/io/BufferedMCLWriter.java java/src/main/java/nl/cwi/monetdb/mcl/net/MapiSocket.java java/src/main/java/nl/cwi/monetdb/mcl/parser/HeaderLineParser.java java/src/main/java/nl/cwi/monetdb/mcl/parser/MCLParseException.java java/src/main/java/nl/cwi/monetdb/mcl/parser/MCLParser.java java/src/main/java/nl/cwi/monetdb/mcl/parser/StartOfHeaderParser.java java/src/main/java/nl/cwi/monetdb/mcl/parser/TupleLineParser.java java/src/main/java/nl/cwi/monetdb/merovingian/Control.java java/src/main/java/nl/cwi/monetdb/merovingian/MerovingianException.java java/src/main/java/nl/cwi/monetdb/merovingian/SabaothDB.java java/src/main/java/nl/cwi/monetdb/util/CmdLineOpts.java java/src/main/java/nl/cwi/monetdb/util/Exporter.java java/src/main/java/nl/cwi/monetdb/util/Extract.java java/src/main/java/nl/cwi/monetdb/util/OptionsException.java java/src/main/java/nl/cwi/monetdb/util/SQLExporter.java java/src/main/java/nl/cwi/monetdb/util/SQLRestore.java java/src/main/java/nl/cwi/monetdb/util/XMLExporter.java java/tests/BugConcurrent_clients_SF_1504657.java java/tests/BugConcurrent_sequences.java java/tests/BugDatabaseMetaData_Bug_3356.java java/tests/BugDecimalRound_Bug_3561.java java/tests/Makefile.ag java/tests/Test_Cautocommit.java java/tests/Test_Cforkbomb.java java/tests/Test_CisValid.java java/tests/Test_Clargequery.java java/tests/Test_Cmanycon.java java/tests/Test_Creplysize.java java/tests/Test_Csavepoints.java java/tests/Test_Csendthread.java java/tests/Test_Ctransaction.java java/tests/Test_Dobjects.java java/tests/Test_FetchSize.java java/tests/Test_Int128.java java/tests/Test_PSgeneratedkeys.java java/tests/Test_PSgetObject.java java/tests/Test_PSlargeamount.java java/tests/Test_PSlargebatchval.java java/tests/Test_PSlargeresponse.java java/tests/Test_PSmanycon.java java/tests/Test_PSmetadata.java java/tests/Test_PSsomeamount.java java/tests/Test_PSsqldata.java java/tests/Test_PStimedate.java java/tests/Test_PStimezone.java java/tests/Test_PStypes.java java/tests/Test_Rbooleans.java java/tests/Test_Rmetadata.java java/tests/Test_Rpositioning.java java/tests/Test_Rsqldata.java java/tests/Test_Rtimedate.java java/tests/Test_Sbatching.java java/tests/Test_Smoreresults.java java/tests/build.properties java/tests/build.xml java/tests/drop.sql java/version.sh Modified Files: .hgtags Makefile.ag MonetDB.spec NT/monetdb_config.h.in NT/rules.msc buildtools/ChangeLog-Archive buildtools/autogen/autogen/am.py buildtools/autogen/autogen/msc.py buildtools/doc/HowToRelease.rst buildtools/doc/windowsbuild.rst clients/Makefile.ag 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/examples/Makefile.ag clients/mapilib/mapi.c clients/mapilib/mapi.rc clients/odbc/driver/driver.rc common/stream/stream.c common/utils/mcrypt.c common/utils/mcrypt.h common/utils/muuid.c configure.ag debian/changelog debian/control debian/rules gdk/gdk_batop.c gdk/gdk_bbp.c gdk/gdk_heap.c gdk/gdk_posix.c gdk/gdk_private.h gdk/gdk_utils.c gdk/libbat.rc libversions monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out monetdb5/mal/Makefile.ag monetdb5/mal/mal_authorize.c monetdb5/mal/mal_debugger.c monetdb5/mal/mal_session.c monetdb5/modules/atoms/uuid.c monetdb5/modules/kernel/bat5.c monetdb5/modules/mal/Tests/clients-hashes.malC monetdb5/modules/mal/clients.c monetdb5/modules/mal/mal_mapi.c monetdb5/modules/mal/mat.c monetdb5/modules/mal/tablet.c monetdb5/optimizer/Tests/dataflow3.stable.out monetdb5/optimizer/opt_emptybind.c monetdb5/optimizer/opt_matpack.c monetdb5/optimizer/opt_mergetable.c monetdb5/optimizer/opt_mitosis.c monetdb5/optimizer/opt_multiplex.c monetdb5/optimizer/opt_projectionpath.c sql/backends/monet5/rel_bin.c sql/backends/monet5/rel_bin.h sql/backends/monet5/sql_gencode.c sql/backends/monet5/sql_optimizer.c sql/backends/monet5/sql_statement.c sql/backends/monet5/sql_statement.h sql/benchmarks/tpch/LOCKED/Tests/01-22.stable.out sql/benchmarks/tpch/LOCKED/Tests/01-22.stable.out.int128 sql/benchmarks/tpch/LOCKED/Tests/14.stable.out sql/benchmarks/tpch/LOCKED/Tests/14.stable.out.int128 sql/benchmarks/tpch/Tests/01-22.stable.out sql/benchmarks/tpch/Tests/01-22.stable.out.int128 sql/benchmarks/tpch/Tests/01-explain.stable.out.int128 sql/benchmarks/tpch/Tests/01-plan.stable.out.int128 sql/benchmarks/tpch/Tests/14-explain.stable.out.int128 sql/benchmarks/tpch/Tests/14-plan.stable.out.int128 sql/benchmarks/tpch/Tests/14.stable.out sql/benchmarks/tpch/Tests/14.stable.out.int128 sql/benchmarks/tpch/Tests/17-explain.stable.out.int128 sql/benchmarks/tpch/Tests/17-plan.stable.out sql/benchmarks/tpch/Tests/17-plan.stable.out.int128 sql/benchmarks/tpch/Tests/20-explain.stable.out.int128 sql/benchmarks/tpch/Tests/20-plan.stable.out.int128 sql/include/sql_catalog.h sql/include/sql_relation.h sql/jdbc/tests/Tests/Test_JdbcClient.stable.out sql/server/rel_distribute.c sql/server/rel_dump.c sql/server/rel_exp.c sql/server/rel_exp.h sql/server/rel_graph.c sql/server/rel_graph.h sql/server/rel_optimizer.c sql/server/rel_partition.c sql/server/rel_rel.c sql/server/rel_rel.h sql/server/rel_select.c sql/test/BugDay_2005-10-06_2.9.3/Tests/not_null.SF-933194.stable.out sql/test/BugDay_2005-10-06_2.9.3/Tests/type_dump_test.SF-989257.stable.out sql/test/BugTracker-2009/Tests/POWER_vs_prod.SF-2596114.stable.out sql/test/BugTracker-2009/Tests/explain_gives_crash.SF-2741829.stable.out sql/test/BugTracker-2014/Tests/querylog.Bug-3607.stable.out sql/test/BugTracker-2016/Tests/CREATE_INDEX_breaks_table_queries.Bug-4053.stable.out sql/test/BugTracker-2016/Tests/concat_2_integers.Bug-4058.stable.out sql/test/BugTracker/Tests/authorization.SF-1430616.stable.out sql/test/BugTracker/Tests/explain.SF-1739353.stable.out sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out sql/test/Tests/All sql/test/Tests/median_stdev.stable.out sql/test/Tests/systemfunctions.stable.out sql/test/Tests/systemfunctions.stable.out.int128 sql/test/emptydb/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/pg_regress/Tests/int2.stable.out testing/Mtest.py.in tools/merovingian/utils/control.c tools/merovingian/utils/utils.c tools/mserver/monet_version.c.in tools/mserver/mserver5.c Branch: graph1 Log Message:
Express the REACHES clause as an expression for the join operator Polluted with a merge with `default' branch diffs (truncated from 45317 to 300 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -632,3 +632,8 @@ 4a05df3932a97865ac7e4037361723d5563490b3 c8b06c670a635978640d742643c317b82c5f4b8c Jun2016_7 4a05df3932a97865ac7e4037361723d5563490b3 Jun2016_SP1_release c8b06c670a635978640d742643c317b82c5f4b8c Jun2016_SP1_release +731a25ce40993c0d73ee4fcefb286b9a0a2e0981 Jun2016_9 +731a25ce40993c0d73ee4fcefb286b9a0a2e0981 Jun2016_SP2_release +f16cdfed96bdc0f3324f8ced85a8b74c67f4dc9b Jun2016_11 +731a25ce40993c0d73ee4fcefb286b9a0a2e0981 Jun2016_SP2_release +f16cdfed96bdc0f3324f8ced85a8b74c67f4dc9b Jun2016_SP2_release diff --git a/ChangeLog b/ChangeLog new file mode 100644 --- /dev/null +++ b/ChangeLog @@ -0,0 +1,13 @@ +# ChangeLog file for devel +# This file is updated with Maddlog + +* Thu Sep 22 2016 Sjoerd Mullender <sjo...@acm.org> +- The Perl, PHP, and Python clients, and the JDBC driver each now have + their own repositories and release cycles. The Python client is + maintained by Gijs Molenaar on Github + (https://github.com/gijzelaerr/pymonetdb), the other clients are + maintained by CWI/MonetDB on our own server + (https://dev.monetdb.org/hg/monetdb-java, + https://dev.monetdb.org/hg/monetdb-perl, + https://dev.monetdb.org/hg/monetdb-php). + diff --git a/Makefile.ag b/Makefile.ag --- a/Makefile.ag +++ b/Makefile.ag @@ -10,7 +10,6 @@ SUBDIRS = buildtools common clients \ HAVE_SQL?sql \ HAVE_GEOM?geom \ tools \ - HAVE_JAVA?java \ HAVE_TESTING?testing \ EXTRA_DIST = bootstrap configure configure.ac configure.ag libversions \ diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -114,7 +114,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/Jun2016-SP1/%{name}-%{version}.tar.bz2 +Source: http://dev.monetdb.org/downloads/sources/Jun2016-SP2/%{name}-%{version}.tar.bz2 # we need systemd for the _unitdir macro to exist %if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} >= 7 @@ -146,7 +146,6 @@ BuildRequires: libuuid-devel BuildRequires: libxml2-devel BuildRequires: openssl-devel BuildRequires: pcre-devel >= 4.5 -BuildRequires: perl BuildRequires: python-devel BuildRequires: readline-devel BuildRequires: unixODBC-devel @@ -356,40 +355,14 @@ fi %{_libdir}/libMonetODBC.so %{_libdir}/libMonetODBCs.so -%package client-perl -Summary: MonetDB perl interface -Group: Applications/Databases -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) -Requires: perl(DBI) -Requires: perl(Digest::SHA) -Requires: perl(Digest::MD5) -# when not using BuildArch: noarch, globally replace perl_vendorlib by -# perl_vendorarch -BuildArch: noarch -%{?perl_default_filter} -%global __requires_exclude perl\\(DBD::monetdb|perl\\(MonetDB::|perl\\(Mapi\\) - -%description client-perl -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 files needed to use MonetDB from a Perl -program. - -%files client-perl -%defattr(-,root,root) -%{perl_vendorlib}/* - %package client-tests Summary: MonetDB Client tests package Group: Applications/Databases Requires: MonetDB5-server%{?_isa} = %{version}-%{release} Requires: %{name}-client%{?_isa} = %{version}-%{release} Requires: %{name}-client-odbc%{?_isa} = %{version}-%{release} -Requires: %{name}-client-perl = %{version}-%{release} -Requires: %{name}-client-php > 11.24.0 +Recommends: perl-DBD-monetdb >= 1.0 +Recommends: php-monetdb >= 1.0 Requires: %{name}-SQL-server5%{?_isa} = %{version}-%{release} Requires: python-monetdb >= 1.0 @@ -872,10 +845,8 @@ developer, but if you do want to test, t --enable-gsl=yes \ --enable-instrument=no \ --enable-int128=%{?with_int128:yes}%{!?with_int128:no} \ - --enable-jdbc=no \ --enable-lidar=%{?with_lidar:yes}%{!?with_lidar:no} \ --enable-mapi=yes \ - --enable-merocontrol=no \ --enable-microhttpd=no \ --enable-monetdb5=yes \ --enable-netcdf=no \ @@ -887,18 +858,14 @@ developer, but if you do want to test, t --enable-sql=yes \ --enable-strict=no \ --enable-testing=yes \ - --with-ant=no \ --with-bz2=yes \ --with-curl=yes \ --with-gdal=%{?with_lidar:yes}%{!?with_lidar:no} \ --with-geos=%{?with_geos:yes}%{!?with_geos:no} \ - --with-java=no \ --with-liblas=%{?with_lidar:yes}%{!?with_lidar:no} \ --with-libxml2=yes \ --with-lzma=yes \ --with-openssl=yes \ - --with-perl=yes \ - --with-perl-libdir=lib/perl5 \ --with-proj=no \ --with-pthread=yes \ --with-python=yes \ @@ -919,10 +886,6 @@ mkdir -p %{buildroot}%{_localstatedir}/M mkdir -p %{buildroot}%{_localstatedir}/monetdb5/dbfarm mkdir -p %{buildroot}%{_localstatedir}/log/monetdb mkdir -p %{buildroot}%{_localstatedir}/run/monetdb -mkdir -p %{buildroot}%{perl_vendorlib} -if [ ! %{buildroot}%{_prefix}/lib/perl5 -ef %{buildroot}%{perl_vendorlib} ]; then - mv %{buildroot}%{_prefix}/lib/perl5/* %{buildroot}%{perl_vendorlib} -fi # remove unwanted stuff # .la files @@ -936,6 +899,30 @@ rm -f %{buildroot}%{_bindir}/Maddlog %postun -p /sbin/ldconfig %changelog +* Wed Sep 28 2016 Sjoerd Mullender <sjo...@acm.org> - 11.23.11-20160928 +- Rebuilt. + +* Mon Sep 26 2016 Sjoerd Mullender <sjo...@acm.org> - 11.23.11-20160928 +- buildtools: We now use the CommonCrypto library instead of the OpenSSL library + on Darwin. + +* Mon Sep 19 2016 Sjoerd Mullender <sjo...@acm.org> - 11.23.9-20160919 +- Rebuilt. +- BZ#3939: Assert failure on concurrent queries when querying sys.queue +- BZ#4019: Casting a timestamp from a string results in NULL +- BZ#4025: expressions in the WHERE clause that evaluates incorrectly +- BZ#4038: After upgrade from 11.21.19, jdbc couldn't list tables for + non sys users +- BZ#4044: Server crash when trying to delete a table has been added to + a merge table with "cascade" at the end +- BZ#4049: Wrong results for queries with "OR" and "LEFT JOIN" +- BZ#4052: Infinite loop in rel_select +- BZ#4054: copy into file wrongly exports functions +- BZ#4059: Geom functions only visible by user monetdb +- BZ#4060: BAT leak in some aggregate queries +- BZ#4062: Error: SELECT: no such binary operator 'like(varchar,varchar)' + when used in query running in other schema than sys + * Wed Jul 13 2016 Sjoerd Mullender <sjo...@acm.org> - 11.23.7-20160713 - Rebuilt. - BZ#4014: KILL signal 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 @@ -345,9 +345,6 @@ /* Define to 1 if you have the `mallopt' function. */ /* #undef HAVE_MALLOPT */ -/* Define to 1 if you have the `MD5' function. */ -#define HAVE_MD5 1 - /* Define to 1 if you have the <memory.h> header file. */ #define HAVE_MEMORY_H 1 @@ -430,9 +427,6 @@ /* Define if the compiler supports the restrict keyword */ /* #undef HAVE_RESTRICT */ -/* Define to 1 if you have the `RIPEMD160' function. */ -#define HAVE_RIPEMD160 1 - /* Define to 1 if you have the `round' function. */ #if !defined(_MSC_VER) || _MSC_VER > 1600 #define HAVE_ROUND 1 @@ -459,20 +453,28 @@ /* Define to 1 if you have the `setsid' function. */ /* #undef HAVE_SETSID */ -/* Define to 1 if you have the `SHA1' function. */ -#define HAVE_SHA1 1 +#ifdef HAVE_OPENSSL +/* Define to 1 if you have the `MD5_Update' function. */ +#define HAVE_MD5_UPDATE 1 -/* Define to 1 if you have the `SHA224' function. */ -#define HAVE_SHA224 1 +/* Define to 1 if you have the `RIPEMD160_Update' function. */ +#define HAVE_RIPEMD160_UPDATE 1 -/* Define to 1 if you have the `SHA256' function. */ -#define HAVE_SHA256 1 +/* Define to 1 if you have the `SHA1_Update' function. */ +#define HAVE_SHA1_UPDATE 1 -/* Define to 1 if you have the `SHA384' function. */ -#define HAVE_SHA384 1 +/* Define to 1 if you have the `SHA224_Update' function. */ +#define HAVE_SHA224_UPDATE 1 -/* Define to 1 if you have the `SHA512' function. */ -#define HAVE_SHA512 1 +/* Define to 1 if you have the `SHA256_Update' function. */ +#define HAVE_SHA256_UPDATE 1 + +/* Define to 1 if you have the `SHA384_Update' function. */ +#define HAVE_SHA384_UPDATE 1 + +/* Define to 1 if you have the `SHA512_Update' function. */ +#define HAVE_SHA512_UPDATE 1 +#endif /* Define to 1 if you have the `shutdown' function. */ #define HAVE_SHUTDOWN 1 @@ -749,6 +751,7 @@ /* The used password hash algorithm */ #define MONETDB5_PASSWDHASH "SHA512" +#define MONETDB5_PASSWDHASH_TOKEN SHA512 /* Release name or "unreleased" */ #define MONETDB_RELEASE "unreleased" diff --git a/NT/rules.msc b/NT/rules.msc --- a/NT/rules.msc +++ b/NT/rules.msc @@ -85,10 +85,6 @@ PYTHON3LIB=python32.lib !ENDIF PYTHON3_LIBDIR=share\MonetDB\python3 -!IFDEF HAVE_PERL -PERL_LIBDIR = share\MonetDB\perl -!ENDIF - !IFDEF HAVE_PCRE # This is the location of the PCRE library !IFNDEF LIBPCRE @@ -202,9 +198,6 @@ GENDLL = RC = rc MT = mt /nologo -JAVAC = javac -JAR = jar -ANT = ant.bat # no need to edit beyond here.. @@ -328,23 +321,6 @@ create_winconfig_conds_new_py: !ELSE $(ECHO) HAVE_HGE_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py" !ENDIF -!IFDEF HAVE_JAVA - $(ECHO) HAVE_JAVA_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py" -!IFDEF HAVE_JAVAJDBC - $(ECHO) HAVE_JAVAJDBC_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py" -!ELSE - $(ECHO) HAVE_JAVAJDBC_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py" -!ENDIF -!IFDEF HAVE_JAVAMEROCONTROL - $(ECHO) HAVE_JAVAMEROCONTROL_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py" -!ELSE - $(ECHO) HAVE_JAVAMEROCONTROL_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py" -!ENDIF -!ELSE - $(ECHO) HAVE_JAVA_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py" - $(ECHO) HAVE_JAVAJDBC_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py" - $(ECHO) HAVE_JAVAMEROCONTROL_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py" -!ENDIF !IFDEF HAVE_LIBBZ2 $(ECHO) HAVE_LIBBZ2_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py" !ELSE @@ -400,11 +376,6 @@ create_winconfig_conds_new_py: !ELSE $(ECHO) HAVE_PCRE_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py" !ENDIF -!IFDEF HAVE_PERL - $(ECHO) HAVE_PERL_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py" _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
