Changeset: d83270ab9ed5 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d83270ab9ed5
Added Files:
        clients/R/Tests/testrandom.R
        clients/R/Tests/testrandom.reqtests
        clients/R/Tests/testrandom.stable.err
        clients/R/Tests/testrandom.stable.out
        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/MonetTwoStageCommit.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
        sql/test/BugTracker-2015/Tests/nil_cast.Bug-3787.sql
        sql/test/BugTracker-2015/Tests/nil_cast.Bug-3787.stable.err
        sql/test/BugTracker-2015/Tests/nil_cast.Bug-3787.stable.out
        sql/test/BugTracker-2015/Tests/nil_cast.Bug-3787.stable.out.int128
        sql/test/BugTracker-2015/Tests/sql2pcre.Bug-3800.sql
        sql/test/BugTracker-2015/Tests/sql2pcre.Bug-3800.stable.err
        sql/test/BugTracker-2015/Tests/sql2pcre.Bug-3800.stable.out
        sql/test/BugTracker-2015/Tests/sum_interval.Bug-3785.sql
        sql/test/BugTracker-2015/Tests/sum_interval.Bug-3785.stable.err
        sql/test/BugTracker-2015/Tests/sum_interval.Bug-3785.stable.out
        sql/test/BugTracker-2015/Tests/useless_casts.Bug-3756.stable.out.single
        sql/test/copy/Tests/incorrect_columns.sql
        sql/test/copy/Tests/incorrect_columns.stable.err
        sql/test/copy/Tests/incorrect_columns.stable.out
        sql/test/pg_regress/Tests/aggregates.reqtests
        sql/test/pg_regress/Tests/alter_table.reqtests
        sql/test/pg_regress/Tests/create_index.reqtests
        sql/test/pg_regress/Tests/create_misc.reqtests
        sql/test/pg_regress/Tests/create_table.reqtests
        sql/test/pg_regress/Tests/create_view.reqtests
        sql/test/pg_regress/Tests/drop.reqtests
        sql/test/pg_regress/Tests/join.reqtests
        sql/test/pg_regress/Tests/limit.reqtests
        sql/test/pg_regress/Tests/plpgsql.reqtests
        sql/test/pg_regress/Tests/portals.reqtests
        sql/test/pg_regress/Tests/portals_p2.reqtests
        sql/test/pg_regress/Tests/prepare.reqtests
        sql/test/pg_regress/Tests/random.reqtests
        sql/test/pg_regress/Tests/select.reqtests
        sql/test/pg_regress/Tests/select_distinct.reqtests
        sql/test/pg_regress/Tests/select_into.reqtests
        sql/test/pg_regress/Tests/select_views.reqtests
        sql/test/pg_regress/Tests/stats.reqtests
        sql/test/pg_regress/Tests/subselect.reqtests
        sql/test/pg_regress/Tests/transactions.reqtests
        sql/test/testdb-upgrade-chain-hge/Tests/All
        sql/test/testdb-upgrade-chain-hge/Tests/dump.SQL.py
        sql/test/testdb-upgrade-chain-hge/Tests/dump.reqtests
        sql/test/testdb-upgrade-chain-hge/Tests/dump.stable.err
        sql/test/testdb-upgrade-chain-hge/Tests/dump.stable.out
        sql/test/testdb-upgrade-chain-hge/Tests/dump.timeout
        sql/test/testdb-upgrade-chain-hge/Tests/package.py
        sql/test/testdb-upgrade-chain-hge/Tests/package.reqtests
        sql/test/testdb-upgrade-chain-hge/Tests/package.stable.err
        sql/test/testdb-upgrade-chain-hge/Tests/package.stable.out
        sql/test/testdb-upgrade-chain-hge/Tests/unpackage.py
        sql/test/testdb-upgrade-chain-hge/Tests/unpackage.stable.err
        sql/test/testdb-upgrade-chain-hge/Tests/unpackage.stable.out
        sql/test/testdb-upgrade-chain-hge/Tests/upgrade.SQL.py
        sql/test/testdb-upgrade-chain-hge/Tests/upgrade.reqtests
        sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.err
        sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out
        sql/test/testdb-upgrade-hge/Tests/All
        sql/test/testdb-upgrade-hge/Tests/dump.SQL.py
        sql/test/testdb-upgrade-hge/Tests/dump.reqtests
        sql/test/testdb-upgrade-hge/Tests/dump.stable.err
        sql/test/testdb-upgrade-hge/Tests/dump.stable.out
        sql/test/testdb-upgrade-hge/Tests/dump.timeout
        sql/test/testdb-upgrade-hge/Tests/unpackage.py
        sql/test/testdb-upgrade-hge/Tests/unpackage.stable.err
        sql/test/testdb-upgrade-hge/Tests/unpackage.stable.out
        sql/test/testdb-upgrade-hge/Tests/upgrade.SQL.py
        sql/test/testdb-upgrade-hge/Tests/upgrade.reqtests
        sql/test/testdb-upgrade-hge/Tests/upgrade.stable.err
        sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out
        sql/test/testdb/Tests/testdb-package-hge.py
        sql/test/testdb/Tests/testdb-package-hge.stable.err
        sql/test/testdb/Tests/testdb-package-hge.stable.out
Removed Files:
        java/src/nl/cwi/monetdb/client/JMonetDB.java
        java/src/nl/cwi/monetdb/client/JdbcClient.java
        java/src/nl/cwi/monetdb/jdbc/MonetBlob.java
        java/src/nl/cwi/monetdb/jdbc/MonetClob.java
        java/src/nl/cwi/monetdb/jdbc/MonetConnection.java
        java/src/nl/cwi/monetdb/jdbc/MonetDataSource.java
        java/src/nl/cwi/monetdb/jdbc/MonetDatabaseMetaData.java
        java/src/nl/cwi/monetdb/jdbc/MonetDriver.java.in
        java/src/nl/cwi/monetdb/jdbc/MonetPreparedStatement.java
        java/src/nl/cwi/monetdb/jdbc/MonetResultSet.java
        java/src/nl/cwi/monetdb/jdbc/MonetSavepoint.java
        java/src/nl/cwi/monetdb/jdbc/MonetStatement.java
        java/src/nl/cwi/monetdb/jdbc/MonetTwoStageCommit.java
        java/src/nl/cwi/monetdb/jdbc/MonetWrapper.java
        java/src/nl/cwi/monetdb/jdbc/types/INET.java
        java/src/nl/cwi/monetdb/jdbc/types/URL.java
        java/src/nl/cwi/monetdb/mcl/MCLException.java
        java/src/nl/cwi/monetdb/mcl/io/BufferedMCLReader.java
        java/src/nl/cwi/monetdb/mcl/io/BufferedMCLWriter.java
        java/src/nl/cwi/monetdb/mcl/net/MapiSocket.java
        java/src/nl/cwi/monetdb/mcl/parser/HeaderLineParser.java
        java/src/nl/cwi/monetdb/mcl/parser/MCLParseException.java
        java/src/nl/cwi/monetdb/mcl/parser/MCLParser.java
        java/src/nl/cwi/monetdb/mcl/parser/StartOfHeaderParser.java
        java/src/nl/cwi/monetdb/mcl/parser/TupleLineParser.java
        java/src/nl/cwi/monetdb/merovingian/Control.java
        java/src/nl/cwi/monetdb/merovingian/MerovingianException.java
        java/src/nl/cwi/monetdb/merovingian/SabaothDB.java
        java/src/nl/cwi/monetdb/util/CmdLineOpts.java
        java/src/nl/cwi/monetdb/util/Exporter.java
        java/src/nl/cwi/monetdb/util/Extract.java
        java/src/nl/cwi/monetdb/util/OptionsException.java
        java/src/nl/cwi/monetdb/util/SQLExporter.java
        java/src/nl/cwi/monetdb/util/SQLRestore.java
        java/src/nl/cwi/monetdb/util/XMLExporter.java
        monetdb5/tests/mapi/Tests/smack01-slow.MAL.bat
        monetdb5/tests/mapi/Tests/smack01-slow.MAL.sh
        monetdb5/tests/mapi/Tests/smack01-slow.stable.err
        monetdb5/tests/mapi/Tests/smack01-slow.stable.out
        sql/test/mergetables/Tests/mergequery.stable.out.single
Modified Files:
        .hgignore
        .hgtags
        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
        clients/ChangeLog.Jul2015
        clients/R/MonetDB.R/NAMESPACE
        clients/R/MonetDB.R/NEWS
        clients/R/MonetDB.R/R/dbi.R
        clients/R/MonetDB.R/man/monetdb.read.csv.Rd
        clients/R/Tests/All
        clients/R/Tests/dbi.R
        clients/R/Tests/dbi.stable.err
        clients/R/Tests/dbi.stable.out
        clients/R/Tests/dplyr-flights.stable.err
        clients/R/Tests/dplyr.stable.err
        clients/R/build-for-cran.sh
        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/ReadlineTools.c
        clients/mapiclient/mclient.1
        clients/mapiclient/mclient.c
        clients/mapiclient/stethoscope.c
        clients/mapiclient/tachograph.c
        clients/mapiclient/tomograph.c
        clients/mapilib/mapi.c
        clients/mapilib/mapi.h
        clients/mapilib/mapi.rc
        clients/odbc/driver/SQLDriverConnect.c
        clients/odbc/driver/driver.rc
        clients/odbc/winsetup/setup.rc
        clients/python2/setup.py
        clients/python3/setup.py
        configure.ag
        debian/changelog
        debian/control
        debian/libmonetdb-client-odbc.postinst
        debian/monetdb5-sql.install
        gdk/ChangeLog
        gdk/gdk.h
        gdk/gdk_align.c
        gdk/gdk_batop.c
        gdk/gdk_calc.c
        gdk/gdk_group.c
        gdk/gdk_heap.c
        gdk/gdk_join.c
        gdk/gdk_logger.c
        gdk/gdk_private.h
        gdk/gdk_select.c
        gdk/gdk_setop.c
        gdk/gdk_system_private.h
        gdk/gdk_unique.c
        gdk/libbat.rc
        java/ChangeLog-Archive
        java/Makefile.ag
        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
        libversions
        monetdb5/ChangeLog
        monetdb5/mal/mal_dataflow.c
        monetdb5/mal/mal_resource.c
        monetdb5/mal/mal_utils.c
        monetdb5/modules/atoms/str.c
        monetdb5/modules/atoms/str.h
        monetdb5/modules/atoms/str.mal
        monetdb5/modules/kernel/algebra.c
        monetdb5/modules/kernel/algebra.h
        monetdb5/modules/kernel/algebra.mal
        monetdb5/modules/mal/mal_mapi.c
        monetdb5/modules/mal/mat.c
        monetdb5/modules/mal/pcre.c
        monetdb5/modules/mal/tablet.c
        monetdb5/optimizer/opt_prelude.c
        monetdb5/optimizer/opt_prelude.h
        monetdb5/tests/mapi/Tests/All
        monetdb5/tests/mapi/Tests/perl_dbi.MAL.bat
        monetdb5/tools/libmonetdb5.rc
        sql/ChangeLog-Archive
        sql/ChangeLog.Jul2015
        sql/backends/monet5/Tests/optimizers.stable.err
        sql/backends/monet5/Tests/rapi13.stable.out
        sql/backends/monet5/generator/Tests/generator03.stable.out
        sql/backends/monet5/rel_bin.c
        sql/backends/monet5/sql_rank.c
        sql/backends/monet5/sql_result.c
        sql/backends/monet5/sql_scenario.c
        sql/backends/monet5/sql_statement.c
        sql/benchmarks/nobench/Tests/nobench.sql
        sql/benchmarks/nobench/Tests/nobench.stable.err
        sql/benchmarks/nobench/Tests/nobench.stable.out
        sql/benchmarks/tpch/LOCKED/Tests/01-22.stable.out
        sql/benchmarks/tpch/LOCKED/Tests/14.stable.out
        sql/benchmarks/tpch/Tests/08-explain.stable.out
        sql/benchmarks/tpch/Tests/17-explain.stable.out
        sql/benchmarks/tpch/Tests/20-explain.stable.out
        sql/benchmarks/tpch/Tests/20-explain.stable.out.32bit
        sql/common/sql_types.c
        sql/server/rel_optimizer.c
        sql/server/rel_select.c
        sql/server/rel_sequence.c
        sql/server/sql_parser.h
        sql/server/sql_parser.y
        sql/storage/bat/bat_utils.c
        sql/storage/bat/bat_utils.h
        
sql/test/BugDay_2005-10-06_2.9.3/Tests/cast_to_interval.SF-1019079.stable.out
        
sql/test/BugDay_2005-10-06_2.9.3/Tests/error_in_sql_parser.SF-1019122.stable.out
        sql/test/BugDay_2005-10-06_2.9.3/Tests/set_types.SF-932360.stable.out
        
sql/test/BugDay_2005-11-09_2.9.3/Tests/date_functions.SF-967145.stable.out
        
sql/test/BugDay_2005-11-09_2.9.3/Tests/interval_on_time_stamp.SF-1080488.stable.out
        
sql/test/BugDay_2005-12-19_2.9.3/Tests/cast_interval.SF.1280682.stable.out
        
sql/test/BugDay_2005-12-19_2.9.3/Tests/interval_times_int.SF-1281996.stable.out
        sql/test/BugTracker-2009/Tests/count_bug.SF-2604583.stable.out
        
sql/test/BugTracker-2010/Tests/error-truncated.Bug-2615.stable.err.Windows
        sql/test/BugTracker-2011/Tests/default-interval.Bug-2877.stable.out
        sql/test/BugTracker-2011/Tests/time_precision.Bug-2873.stable.out
        
sql/test/BugTracker-2012/Tests/incorrect_cast_from_double_to_int.Bug-2579.stable.out
        
sql/test/BugTracker-2012/Tests/now_results_in_illegal_argument.Bug-2978.stable.out
        sql/test/BugTracker-2012/Tests/timestamp-diff.Bug-3190.stable.out
        sql/test/BugTracker-2014/Tests/current_timestamp.Bug-3427.stable.out
        sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.stable.out
        sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.stable.out.single
        sql/test/BugTracker-2015/Tests/All
        sql/test/BugTracker-2015/Tests/cardinality.Bug-3761.sql
        sql/test/BugTracker-2015/Tests/cardinality.Bug-3761.stable.out
        sql/test/BugTracker-2015/Tests/div_zero.Bug-3742.stable.out
        sql/test/BugTracker/Tests/cast_interval2time.SF-1488247.stable.out
        sql/test/Tests/timezone.stable.out
        sql/test/Users/Tests/dropManyUsers.Bug-3764.stable.out
        sql/test/VOC/Tests/median.Bug-3096.stable.out
        sql/test/bugs/Tests/default_with_cast.SF-1334486.stable.out
        sql/test/bugs/Tests/interval_convert_bugs-sf-1274077-1274085.stable.out
        sql/test/bugs/Tests/interval_parse_bug-sf-1263967.stable.out
        sql/test/copy/Tests/All
        sql/test/copy/Tests/key_copy.sql
        sql/test/copy/Tests/key_copy.stable.err
        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.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.int128
        sql/test/leaks/Tests/temp2.stable.out.int128
        sql/test/leaks/Tests/temp3.stable.out.int128
        sql/test/mapi/Tests/perl_dbi.SQL.bat
        sql/test/mergetables/Tests/All
        sql/test/pg_regress/Tests/All
        sql/test/pg_regress/Tests/alter_table.stable.out
        sql/test/pg_regress/Tests/date.stable.out
        sql/test/pg_regress/Tests/horology.stable.out
        sql/test/pg_regress/Tests/interval.stable.out
        sql/test/pg_regress/Tests/interval.stable.out.int128
        sql/test/pg_regress/Tests/reltime.stable.out
        sql/test/pg_regress/Tests/time.stable.out
        sql/test/pg_regress/Tests/timestamp.stable.out
        sql/test/pg_regress/Tests/timestamptz.stable.out
        sql/test/pg_regress/Tests/timetz.stable.out
        sql/test/remote/Tests/ssbm.SQL.py
        sql/test/snodgrass/Tests/cast_select.stable.out
        sql/test/snodgrass/Tests/interval_parsing.stable.out
        sql/test/testdb-upgrade-chain/Tests/All
        sql/test/testdb-upgrade-chain/Tests/package.py
        sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
        sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
        sql/test/testdb-upgrade/Tests/dump.stable.out
        sql/test/testdb-upgrade/Tests/dump.stable.out.Windows
        sql/test/testdb-upgrade/Tests/upgrade.stable.out
        sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
        sql/test/testdb/Tests/All
        sql/test/testdb/Tests/testdb-package.py
        testing/Mtest.py.in
        vertoo.data
Branch: 2PC
Log Message:

Merge with default branch


diffs (truncated from 250951 to 300 lines):

diff --git a/.hgignore b/.hgignore
--- a/.hgignore
+++ b/.hgignore
@@ -65,6 +65,10 @@ lex.yy.c
 *.gem
 # java:
 *.jar
+java/build
+java/target
+java/bin
+java/src/main/java/nl/cwi/monetdb/jdbc/MonetDriver.java
 # python:
 dist
 
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -599,3 +599,9 @@ a1a48562a4651b1beb3168290777cbeb91f474d8
 71a9c48c90348eab78069f2ecc616e3f73bbba95 Jul2015_root
 77c8f3354e948ccd094ab3e53631b9fe272da8ea Jul2015_1
 77c8f3354e948ccd094ab3e53631b9fe272da8ea Jul2015_release
+30be7bd4aec0b5daf3d2f3a26a1043c04b88bb6d Jul2015_3
+77c8f3354e948ccd094ab3e53631b9fe272da8ea Jul2015_release
+30be7bd4aec0b5daf3d2f3a26a1043c04b88bb6d Jul2015_release
+c7c0a76e663e34bcddae683b385c8e5a919ffd84 Jul2015_5
+30be7bd4aec0b5daf3d2f3a26a1043c04b88bb6d Jul2015_release
+c7c0a76e663e34bcddae683b385c8e5a919ffd84 Jul2015_release
diff --git a/MacOSX/post-install.sh b/MacOSX/post-install.sh
--- a/MacOSX/post-install.sh
+++ b/MacOSX/post-install.sh
@@ -1,2 +1,7 @@
 #!/bin/bash
-echo 'export PATH=/usr/local/monetdb/bin:$PATH' >> ~/.profile
+
+monetdb_path=/usr/local/monetdb/bin
+
+if [[ ":$PATH:" != *":$monetdb_path:"* ]]; then
+    printf '\n# Set MonetDB path\nexport PATH=$PATH:'$monetdb_path'\n' >> 
~/.profile
+fi
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -659,6 +659,7 @@ fi
 %exclude %{_libdir}/monetdb5/sql*.mal
 %if %{bits} == 64
 %exclude %{_libdir}/monetdb5/*_hge.mal
+%exclude %{_libdir}/monetdb5/autoload/*_hge.mal
 %endif
 %{_libdir}/monetdb5/*.mal
 %if %{?with_geos:1}%{!?with_geos:0}
@@ -969,7 +970,7 @@ developer, but if you do want to test, t
        --with-valgrind=no \
        %{?comp_cc:CC="%{comp_cc}"}
 
-make
+make %{?_smp_mflags}
 
 %install
 %make_install
@@ -995,6 +996,32 @@ rm -f %{buildroot}%{_bindir}/Maddlog
 %postun -p /sbin/ldconfig
 
 %changelog
+* Mon Aug 24 2015 Sjoerd Mullender <sjo...@acm.org> - 11.21.5-20150824
+- Rebuilt.
+- BZ#3730: SAMPLE function not sampling randomly
+
+* Tue Aug 18 2015 Sjoerd Mullender <sjo...@acm.org> - 11.21.3-20150818
+- Rebuilt.
+- BZ#3361: constants as MAL function parameters prevent intermediate reuse
+- BZ#3440: Sequence type errors
+- BZ#3449: mserver crash on start - Freebsd 10 amd64
+- BZ#3496: autocompletion table names does not work correctly
+- BZ#3758: "COPY INTO ..." doesn't work, if executing from 2 processes
+  concurrently.
+- BZ#3763: JDBC PreparedStatement for a table with 14 Foreign Keys
+  crashing the Database
+- BZ#3783: Behavioural change in Jul2015 for 'timestamp minus timestamp'
+- BZ#3784: Assertion failed: (bn->batCapacity >= cnt), function
+  BAT_scanselect, file gdk_select.c, line 1008.
+- BZ#3785: sum(interval) causes overflow in conversion to bte
+- BZ#3786: ResultSet.close() never sends Xclose to free resources
+- BZ#3787: "b and g must be aligned" from complex group/union query
+- BZ#3791: HEAPextend: failed to extend to 2420077101056
+
+* Tue Aug 18 2015 Sjoerd Mullender <sjo...@acm.org> - 11.21.3-20150818
+- sql: Differences between time, timestamp, and date values now return properly
+  typed interval types (second or month intervals) instead of integers.
+
 * Fri Aug 07 2015 Sjoerd Mullender <sjo...@acm.org> - 11.21.1-20150807
 - Rebuilt.
 - BZ#3364: Cannot set role back to a user's default role
@@ -1063,7 +1090,7 @@ rm -f %{buildroot}%{_bindir}/Maddlog
 - java: Improved JDBC driver to not throw NullPointerException anymore
   when calling isNullable() or getPrecision() or getScale() or
   getColumnDisplaySize() or getSchemaName() or getTableName() or
-  getColumnClassName() on a ResultSet object.
+  getColumnClassName() on a ResultSetMetaData object.
 
 * Tue Jul 28 2015 Sjoerd Mullender <sjo...@acm.org> - 11.21.1-20150807
 - sql: Added support for 128-bit integers (called HUGEINT) on platforms that
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
@@ -15,67 +15,37 @@
     {
         "Entry"
         {
-        "MsmKey" = "8:_00254E461FF14CF588756AEF1B36F2AC"
-        "OwnerKey" = "8:_UNDEFINED"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_023E6BF2FACE4557AF196C75487BDEB5"
-        "OwnerKey" = "8:_UNDEFINED"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
         "MsmKey" = "8:_03431EDC85094776AD217020CB3E26D4"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_03CF05EFB02B4531B8766111D581EC06"
-        "OwnerKey" = "8:_UNDEFINED"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
         "MsmKey" = "8:_05D32586D7A945E1B82C9FA8FEE9D43E"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_076DB41FCD394A23B579C471B0340D78"
+        "MsmKey" = "8:_074D8F38A50444E6B96223224070E1DF"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_089BE1648F634FB1B8D5F0FD67422959"
+        "MsmKey" = "8:_0773023B7150411482928C57ECACAE9F"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_08C185D141A64405BE756D244F9DBF3D"
+        "MsmKey" = "8:_08B1AFC74A304371BB05D1D3CE98C875"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_08FE3FD8B70B485EA4405D5FA91E1F1D"
-        "OwnerKey" = "8:_UNDEFINED"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_0AE7CEC472424498BE91110C8D49AA47"
-        "OwnerKey" = "8:_UNDEFINED"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_0CDB70435AB445EFA241C339B1B8F894"
+        "MsmKey" = "8:_09FBEC45869A4084A16EDCD466B16092"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
@@ -87,13 +57,13 @@
         }
         "Entry"
         {
-        "MsmKey" = "8:_0E18252D4E224A0CAF305750224DFE98"
+        "MsmKey" = "8:_0F66DC1DDDA7403D934AF442E2D3DA0E"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_10AA61E141204740AE8E2714C0193F9F"
+        "MsmKey" = "8:_1030729CA0DC408C8B8325AECC2E4573"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
@@ -105,49 +75,13 @@
         }
         "Entry"
         {
-        "MsmKey" = "8:_13AABB7CCFD34C6BB389B81F4CB77401"
+        "MsmKey" = "8:_16CD7E0F3D1545D2947A499FC89B5718"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_13FEB0A975F8410DBC860E7A6557DC16"
-        "OwnerKey" = "8:_UNDEFINED"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_161D8A7890854F1691E4CDC8BC879F34"
-        "OwnerKey" = "8:_UNDEFINED"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_16F028BE8C544E7B933EF459FD314C06"
-        "OwnerKey" = "8:_UNDEFINED"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_170EDFB3FC38443CB2B703841250E38C"
-        "OwnerKey" = "8:_UNDEFINED"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_180C704BBB674E438C8A29F1579062FD"
-        "OwnerKey" = "8:_UNDEFINED"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_19585692353446199E183C23D1FCD695"
-        "OwnerKey" = "8:_UNDEFINED"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_19A67EBC426B4C1C87367D01F34C9B82"
+        "MsmKey" = "8:_17197E5876DE40E08B7A967D69F485E0"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
@@ -159,13 +93,7 @@
         }
         "Entry"
         {
-        "MsmKey" = "8:_1D029A986AA44C02AC04765B2855BF65"
-        "OwnerKey" = "8:_UNDEFINED"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_1DA13DE1A8A24C5FB5CF49CD4DB61DF7"
+        "MsmKey" = "8:_1EA00E6F0A8345D9B86AE0E0308E307D"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
@@ -183,7 +111,7 @@
         }
         "Entry"
         {
-        "MsmKey" = "8:_2289039FD04A44AD8169CB12C81DF8FF"
+        "MsmKey" = "8:_23B4857D65D5496A84485F36222EE1E6"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
@@ -195,19 +123,37 @@
         }
         "Entry"
         {
-        "MsmKey" = "8:_2772CB6509D248C38E00C9DAC069AAA2"
+        "MsmKey" = "8:_26235CEEA97A4DE88328C92B73EB082E"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_2A69C8F0B6A34975B94A9D8F8BD184B9"
+        "MsmKey" = "8:_26249AD300854042B8B66ED1B1313A92"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_2B17C9166D0D40288BB0CABF731F8DB8"
+        "MsmKey" = "8:_28094724116C45608490F7868A4B9CA3"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_299D4D67ABB2412D8EAD89329A3C7CB4"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_29C19444DEFC455B93B70CD08284DE4C"
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to