Changeset: 996f74d3397b for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=996f74d3397b
Added Files:
clients/R/Tests/testrandom.R
clients/R/Tests/testrandom.reqtests
clients/R/Tests/testrandom.stable.err
clients/R/Tests/testrandom.stable.out
common/utils/mprompt.h
common/utils/prompt.c
debian/libmonetdb-stream7.install
debian/libmonetdb12.install
sql/backends/monet5/Tests/rapi13.stable.err
sql/backends/monet5/Tests/rapi13.stable.out
sql/backends/monet5/Tests/rapi14.stable.err
sql/backends/monet5/Tests/rapi14.stable.out
sql/backends/monet5/Tests/rapi15.sql
sql/backends/monet5/Tests/rapi15.stable.err
sql/backends/monet5/Tests/rapi15.stable.out
sql/backends/monet5/sql_rank.c
sql/backends/monet5/sql_rank.h
sql/test/BugTracker-2015/Tests/apply_merge_distinct.Bug-3760.sql
sql/test/BugTracker-2015/Tests/apply_merge_distinct.Bug-3760.stable.err
sql/test/BugTracker-2015/Tests/apply_merge_distinct.Bug-3760.stable.out
sql/test/BugTracker-2015/Tests/cardinality.Bug-3761.sql
sql/test/BugTracker-2015/Tests/cardinality.Bug-3761.stable.err
sql/test/BugTracker-2015/Tests/cardinality.Bug-3761.stable.out
sql/test/BugTracker-2015/Tests/cast_on_groupby_col_crash.Bug-3769.sql
sql/test/BugTracker-2015/Tests/cast_on_groupby_col_crash.Bug-3769.stable.err
sql/test/BugTracker-2015/Tests/cast_on_groupby_col_crash.Bug-3769.stable.out
sql/test/BugTracker-2015/Tests/crash_on_declared_table.Bug-3770.sql
sql/test/BugTracker-2015/Tests/crash_on_declared_table.Bug-3770.stable.err
sql/test/BugTracker-2015/Tests/crash_on_declared_table.Bug-3770.stable.out
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/schemadiff.SQL.py
sql/test/BugTracker-2015/Tests/sessions_crash.Bug-3759.sql
sql/test/BugTracker-2015/Tests/sessions_crash.Bug-3759.stable.err
sql/test/BugTracker-2015/Tests/sessions_crash.Bug-3759.stable.out
sql/test/BugTracker-2015/Tests/set_default_role.Bug-3364.sql
sql/test/BugTracker-2015/Tests/set_default_role.Bug-3364.stable.err
sql/test/BugTracker-2015/Tests/set_default_role.Bug-3364.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.sql
sql/test/BugTracker-2015/Tests/useless_casts.Bug-3756.stable.err
sql/test/BugTracker-2015/Tests/useless_casts.Bug-3756.stable.out
sql/test/BugTracker-2015/Tests/useless_casts.Bug-3756.stable.out.single
sql/test/Users/Tests/columnRights.SQL.py
sql/test/Users/Tests/columnRights.stable.err
sql/test/Users/Tests/columnRights.stable.out
sql/test/Users/Tests/grantMonetdb.SQL.py
sql/test/Users/Tests/grantMonetdb.stable.err
sql/test/Users/Tests/grantMonetdb.stable.out
sql/test/Users/Tests/grantPrivilegesNonDefaultRole.Bug-3365.SQL.py
sql/test/Users/Tests/grantPrivilegesNonDefaultRole.Bug-3365.stable.err
sql/test/Users/Tests/grantPrivilegesNonDefaultRole.Bug-3365.stable.out
sql/test/Users/Tests/withGrantOption.SQL.py
sql/test/Users/Tests/withGrantOption.stable.err
sql/test/Users/Tests/withGrantOption.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
Removed Files:
buildtools/ChangeLog.Oct2014
clients/ChangeLog.Oct2014
clients/R/Makefile.ag
clients/R/MonetDB.R/Makefile.ag
clients/R/MonetDB.R/src/Makefile.ag
clients/R/MonetDB.R/src/profiler-r.c
clients/R/MonetDB.R/src/profiler.c
clients/R/MonetDB.R/src/profiler.h
clients/mapiclient/mapisplit-dummy.c
clients/mapiclient/mprompt.h
clients/mapiclient/profiler-dummy.c
clients/mapiclient/prompt.c
clients/mapilib/ChangeLog.Oct2014
clients/python2/ChangeLog.Oct2014
clients/python3/ChangeLog.Oct2014
common/stream/ChangeLog.Oct2014
debian/libmonetdb-stream6.install
debian/libmonetdb11.install
gdk/ChangeLog.Oct2014
geom/ChangeLog.Oct2014
java/ChangeLog.Oct2014
monetdb5/ChangeLog.Oct2014
sql/ChangeLog.Oct2014
testing/ChangeLog.Oct2014
tools/merovingian/ChangeLog.Oct2014
Modified Files:
.hgignore
.hgtags
MacOSX/MonetDB.pkgproj
MacOSX/post-install.sh
MonetDB.spec
NT/installer32/MonetDB-ODBC-Installer.vdproj
NT/installer32/MonetDB5-Geom-Module.vdproj
NT/installer32/MonetDB5-SQL-Installer.vdproj
NT/installer64/MonetDB-ODBC-Installer.vdproj
NT/installer64/MonetDB5-Geom-Module.vdproj
NT/installer64/MonetDB5-SQL-Installer.vdproj
NT/monetdb_config.h.in
NT/rules.msc
buildtools/ChangeLog-Archive
buildtools/ChangeLog.Jul2015
clients/ChangeLog-Archive
clients/ChangeLog.Jul2015
clients/Makefile.ag
clients/R/MonetDB.R/DESCRIPTION
clients/R/MonetDB.R/NAMESPACE
clients/R/MonetDB.R/NEWS
clients/R/MonetDB.R/R/dbapply.R
clients/R/MonetDB.R/R/dbi.R
clients/R/MonetDB.R/R/dplyr.R
clients/R/MonetDB.R/man/dbApply.Rd
clients/R/MonetDB.R/man/monetdb.read.csv.Rd
clients/R/Tests/All
clients/R/Tests/dbapply.R
clients/R/Tests/dbapply.reqtests
clients/R/Tests/dbapply.stable.out
clients/R/Tests/dbi.R
clients/R/Tests/dbi.stable.err
clients/R/Tests/dbi.stable.out
clients/R/Tests/deps-install.R
clients/R/Tests/deps-test.R
clients/R/Tests/deps-test.timeout
clients/R/Tests/dplyr-flights.R
clients/R/Tests/dplyr-flights.reqtests
clients/R/Tests/dplyr-flights.stable.err
clients/R/Tests/dplyr.reqtests
clients/R/Tests/install.reqtests
clients/R/Tests/survey.reqtests
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/Makefile.ag
clients/mapiclient/ReadlineTools.c
clients/mapiclient/Tests/mclient--help.stable.err
clients/mapiclient/Tests/mclient--help.stable.err.Windows
clients/mapiclient/dump.c
clients/mapiclient/eventparser.c
clients/mapiclient/eventparser.h
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.rc
clients/odbc/driver/Makefile.ag
clients/odbc/driver/SQLExecute.c
clients/odbc/driver/SQLTables.c
clients/odbc/driver/driver.rc
clients/odbc/winsetup/setup.rc
clients/python2/monetdb/mapi.py
clients/python2/setup.py
clients/python3/ChangeLog.Jul2015
clients/python3/monetdb/mapi.py
clients/python3/setup.py
common/options/monet_options.c
common/stream/stream.c
common/utils/Makefile.ag
common/utils/mutils.c
configure.ag
debian/changelog
debian/control
debian/libmonetdb-client-odbc.postinst
debian/monetdb5-sql.install
gdk/ChangeLog
gdk/ChangeLog-Archive
gdk/ChangeLog.Jul2015
gdk/gdk.h
gdk/gdk_align.c
gdk/gdk_atoms.c
gdk/gdk_bat.c
gdk/gdk_batop.c
gdk/gdk_bbp.c
gdk/gdk_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_storage.c
gdk/gdk_system_private.h
gdk/gdk_unique.c
gdk/gdk_utils.c
gdk/libbat.rc
java/ChangeLog-Archive
java/ChangeLog.Jul2015
java/Makefile.ag
java/build.properties
java/pom.xml
java/release.txt
java/src/nl/cwi/monetdb/jdbc/MonetConnection.java
java/src/nl/cwi/monetdb/jdbc/MonetDatabaseMetaData.java
java/src/nl/cwi/monetdb/jdbc/MonetResultSet.java
libversions
monetdb5/ChangeLog
monetdb5/ChangeLog-Archive
monetdb5/ChangeLog.Jul2015
monetdb5/extras/rapi/Tests/All
monetdb5/extras/rapi/rapi.c
monetdb5/mal/mal_authorize.c
monetdb5/mal/mal_dataflow.c
monetdb5/mal/mal_interpreter.c
monetdb5/mal/mal_parser.c
monetdb5/mal/mal_profiler.c
monetdb5/modules/kernel/algebra.c
monetdb5/modules/kernel/algebra.h
monetdb5/modules/kernel/algebra.mal
monetdb5/modules/mal/Tests/inspect05.stable.out
monetdb5/modules/mal/Tests/inspect05.stable.out.int128
monetdb5/modules/mal/clients.c
monetdb5/modules/mal/mal_io.c
monetdb5/modules/mal/mal_mapi.c
monetdb5/modules/mal/mat.c
monetdb5/optimizer/opt_mergetable.c
monetdb5/optimizer/opt_prelude.c
monetdb5/optimizer/opt_prelude.h
monetdb5/optimizer/opt_support.c
monetdb5/tests/mapi/Tests/perl_dbi.MAL.bat
monetdb5/tools/libmonetdb5.rc
sql/ChangeLog-Archive
sql/ChangeLog.Jul2015
sql/backends/monet5/Makefile.ag
sql/backends/monet5/Tests/All
sql/backends/monet5/Tests/optimizers.stable.err
sql/backends/monet5/Tests/rapi14.sql
sql/backends/monet5/generator/Tests/generator03.stable.out
sql/backends/monet5/rel_bin.c
sql/backends/monet5/sql.c
sql/backends/monet5/sql.h
sql/backends/monet5/sql.mal
sql/backends/monet5/sql_rank.mal
sql/backends/monet5/sql_result.c
sql/backends/monet5/sql_scenario.c
sql/backends/monet5/sql_statement.c
sql/backends/monet5/sql_upgrades.c
sql/common/sql_types.c
sql/include/sql_catalog.h
sql/include/sql_relation.h
sql/scripts/17_temporal.sql
sql/scripts/25_debug.sql
sql/scripts/75_storagemodel.sql
sql/scripts/80_statistics.sql
sql/server/rel_exp.c
sql/server/rel_exp.h
sql/server/rel_optimizer.c
sql/server/rel_schema.c
sql/server/rel_select.c
sql/server/rel_sequence.c
sql/server/rel_updates.c
sql/server/sql_parser.h
sql/server/sql_parser.y
sql/server/sql_privileges.c
sql/storage/bat/bat_storage.c
sql/storage/bat/bat_utils.c
sql/storage/bat/bat_utils.h
sql/storage/sql_storage.h
sql/storage/store.c
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/grant_public.SF-1114580.stable.err
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-2009/Tests/count_bug.SF-2604583.stable.out.int128
sql/test/BugTracker-2009/Tests/orderby_with_row_number.SF-2895791.stable.out
sql/test/BugTracker-2010/Tests/crash_on_complex_join_exp.Bug-2353.stable.out
sql/test/BugTracker-2010/Tests/error-truncated.Bug-2615.stable.err.Windows
sql/test/BugTracker-2010/Tests/rank-over-crash.SF-2926454.stable.out.int128
sql/test/BugTracker-2010/Tests/with_row_number_crash.Bug-2631.stable.out
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/row_number_does_not_work_in_complex_query.Bug-2805.stable.out
sql/test/BugTracker-2012/Tests/scalar_subquery_with_alias.Bug-3093.stable.out
sql/test/BugTracker-2012/Tests/timestamp-diff.Bug-3190.stable.out
sql/test/BugTracker-2013/Tests/All
sql/test/BugTracker-2013/Tests/sort_void_crash.Bug-3341.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/assertHead.Bug-3706.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/BugTracker/Tests/with_row_number.SF-1898089.stable.out
sql/test/Tests/rank.stable.out
sql/test/Tests/systemfunctions.stable.out
sql/test/Tests/systemfunctions.stable.out.int128
sql/test/Tests/timezone.stable.out
sql/test/Users/Tests/All
sql/test/Users/Tests/dropManyUsers.Bug-3764.stable.err
sql/test/Users/Tests/dropManyUsers.Bug-3764.stable.out
sql/test/Users/Tests/grantAndRevokeUserLogedIN.Bug-3476.stable.err
sql/test/Users/Tests/grantAndRevokeUserLogedIN.Bug-3476.stable.out
sql/test/Users/Tests/grantMonetdbToSchemaOwner.Bug-3771.SQL.py
sql/test/Users/Tests/grantMonetdbToSchemaOwner.Bug-3771.stable.err
sql/test/Users/Tests/grantMonetdbToSchemaOwner.Bug-3771.stable.out
sql/test/Users/Tests/grantRevokeAndGrantAgain.Bug-3765.SQL.py
sql/test/Users/Tests/grantRevokeAndGrantAgain.Bug-3765.stable.err
sql/test/Users/Tests/grantRevokeAndGrantAgain.Bug-3765.stable.out
sql/test/Users/Tests/grantRole.Bug-3772.SQL.py
sql/test/Users/Tests/grantRole.Bug-3772.stable.err
sql/test/Users/Tests/grantRole.Bug-3772.stable.out
sql/test/Users/Tests/test_privs2_p2.stable.err
sql/test/VOC/Tests/median.Bug-3096.stable.out
sql/test/bugs/Tests/crash_order_by.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/leaks/Tests/check0.stable.out
sql/test/leaks/Tests/check0.stable.out.int128
sql/test/leaks/Tests/check1.stable.out
sql/test/leaks/Tests/check1.stable.out.int128
sql/test/leaks/Tests/check2.stable.out
sql/test/leaks/Tests/check2.stable.out.int128
sql/test/leaks/Tests/check3.stable.out
sql/test/leaks/Tests/check3.stable.out.int128
sql/test/leaks/Tests/check4.stable.out
sql/test/leaks/Tests/check4.stable.out.int128
sql/test/leaks/Tests/check5.stable.out
sql/test/leaks/Tests/check5.stable.out.int128
sql/test/leaks/Tests/drop3.stable.out
sql/test/leaks/Tests/drop3.stable.out.int128
sql/test/leaks/Tests/select1.stable.out
sql/test/leaks/Tests/select1.stable.out.int128
sql/test/leaks/Tests/select2.stable.out
sql/test/leaks/Tests/select2.stable.out.int128
sql/test/leaks/Tests/temp1.stable.out
sql/test/leaks/Tests/temp1.stable.out.int128
sql/test/leaks/Tests/temp2.stable.out
sql/test/leaks/Tests/temp2.stable.out.int128
sql/test/leaks/Tests/temp3.stable.out
sql/test/leaks/Tests/temp3.stable.out.int128
sql/test/mapi/Tests/perl_dbi.SQL.bat
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/remote/Tests/ssbm.stable.out
sql/test/remote/Tests/ssbm.stable.out.int128
sql/test/snodgrass/Tests/cast_select.stable.out
sql/test/snodgrass/Tests/interval_parsing.stable.out
sql/test/testdb-upgrade-chain/Tests/dump.stable.out
sql/test/testdb-upgrade-chain/Tests/dump.stable.out.Windows
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
testing/Mtest.py.in
tools/mserver/mserver5.c
vertoo.data
Branch: leftmart
Log Message:
merge with default
diffs (truncated from 51979 to 300 lines):
diff --git a/.hgignore b/.hgignore
--- a/.hgignore
+++ b/.hgignore
@@ -65,6 +65,7 @@ lex.yy.c
*.gem
# java:
*.jar
+java/target/classes/nl/cwi/monetdb/jdbc/MonetDriver.java.in
# python:
dist
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -597,3 +597,8 @@ a1a48562a4651b1beb3168290777cbeb91f474d8
027c8ada676bad1e7af0703ae48c27c6fb8433a0 Oct2014_SP4_release
a1a48562a4651b1beb3168290777cbeb91f474d8 Oct2014_SP4_release
71a9c48c90348eab78069f2ecc616e3f73bbba95 Jul2015_root
+77c8f3354e948ccd094ab3e53631b9fe272da8ea Jul2015_1
+77c8f3354e948ccd094ab3e53631b9fe272da8ea Jul2015_release
+30be7bd4aec0b5daf3d2f3a26a1043c04b88bb6d Jul2015_3
+77c8f3354e948ccd094ab3e53631b9fe272da8ea Jul2015_release
+30be7bd4aec0b5daf3d2f3a26a1043c04b88bb6d Jul2015_release
diff --git a/MacOSX/MonetDB.pkgproj b/MacOSX/MonetDB.pkgproj
--- a/MacOSX/MonetDB.pkgproj
+++ b/MacOSX/MonetDB.pkgproj
@@ -504,7 +504,7 @@
<key>CONCLUSION_ACTION</key>
<integer>0</integer>
<key>IDENTIFIER</key>
-
<string>com.monetdbsolutions.pkg.monetdb</string>
+ <string>org.monetdb.pkg.monetdb</string>
<key>NAME</key>
<string>MonetDB</string>
<key>OVERWRITE_PERMISSIONS</key>
@@ -815,13 +815,6 @@
<key>PATH_TYPE</key>
<integer>1</integer>
</dict>
- <key>CERTIFICATE</key>
- <dict>
- <key>NAME</key>
- <string>Developer ID Installer: MonetDB
Solutions B.V. (YEJLE7L8A4)</string>
- <key>PATH</key>
-
<string>/Users/sjoerd/Library/Keychains/login.keychain</string>
- </dict>
<key>EXCLUDED_FILES</key>
<array>
<dict>
@@ -991,7 +984,7 @@
</dict>
</array>
<key>NAME</key>
- <string>MonetDB</string>
+ <string>MonetDB-unsigned</string>
</dict>
</dict>
<key>TYPE</key>
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
@@ -91,7 +91,7 @@ Vendor: MonetDB BV <i...@monetdb.org>
Group: Applications/Databases
License: MPL - http://www.monetdb.org/Legal/MonetDBLicense
URL: http://www.monetdb.org/
-Source:
http://dev.monetdb.org/downloads/sources/Oct2014-SP4/%{name}-%{version}.tar.bz2
+Source:
http://dev.monetdb.org/downloads/sources/Jul2015/%{name}-%{version}.tar.bz2
BuildRequires: bison
BuildRequires: bzip2-devel
@@ -136,9 +136,9 @@ BuildRequires: R-core-devel
%endif
%if (0%{?fedora} >= 22)
-Recommends: %{name}-SQL-server5
-Recommends: MonetDB5-server
-Suggests: %{name}-client
+Recommends: %{name}-SQL-server5%{?_isa} = %{version}-%{release}
+Recommends: MonetDB5-server%{?_isa} = %{version}-%{release}
+Suggests: %{name}-client%{?_isa} = %{version}-%{release}
%endif
# need to define python_sitelib on RHEL 5 and older
@@ -233,7 +233,7 @@ library.
Summary: MonetDB - Monet Database Management System Client Programs
Group: Applications/Databases
%if (0%{?fedora} >= 22)
-Recommends: %{name}-SQL-server5
+Recommends: %{name}-SQL-server5%{?_isa} = %{version}-%{release}
%endif
%description client
@@ -598,9 +598,11 @@ Requires(pre): shadow-utils
Requires: %{name}-client%{?_isa} = %{version}-%{release}
Obsoletes: MonetDB5-server-rdf
%if (0%{?fedora} >= 22)
-Recommends: %{name}-SQL-server5
-Recommends: MonetDB5-server-hugeint
-Suggests: %{name}-client
+Recommends: %{name}-SQL-server5%{?_isa} = %{version}-%{release}
+%if %{bits} == 64
+Recommends: MonetDB5-server-hugeint%{?_isa} = %{version}-%{release}
+%endif
+Suggests: %{name}-client%{?_isa} = %{version}-%{release}
%endif
%description -n MonetDB5-server
@@ -655,7 +657,10 @@ fi
%exclude %{_libdir}/monetdb5/rapi.mal
%endif
%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}
%exclude %{_libdir}/monetdb5/autoload/*_geom.mal
@@ -685,6 +690,7 @@ fi
%docdir %{_datadir}/doc/MonetDB
%{_datadir}/doc/MonetDB/*
+%if %{bits} == 64
%package -n MonetDB5-server-hugeint
Summary: MonetDB - 128-bit integer support for MonetDB5-server
Group: Application/Databases
@@ -704,6 +710,7 @@ MonetDB5-server component.
%{_libdir}/monetdb5/*_hge.mal
%exclude %{_libdir}/monetdb5/autoload/??_sql_hge.mal
%{_libdir}/monetdb5/autoload/*_hge.mal
+%endif
%package -n MonetDB5-server-devel
Summary: MonetDB development files
@@ -738,8 +745,10 @@ Requires: %{_bindir}/systemd-tmpfiles
Obsoletes: MonetDB-SQL-devel
Obsoletes: %{name}-SQL
%if (0%{?fedora} >= 22)
-Recommends: %{name}-SQL-server5-hugeint
-Suggests: %{name}-client
+%if %{bits} == 64
+Recommends: %{name}-SQL-server5-hugeint%{?_isa} = %{version}-%{release}
+%endif
+Suggests: %{name}-client%{?_isa} = %{version}-%{release}
%endif
%description SQL-server5
@@ -781,16 +790,19 @@ systemd-tmpfiles --create %{_sysconfdir}
%if %{?with_samtools:1}%{!?with_samtools:0}
%exclude %{_libdir}/monetdb5/createdb/*_bam.sql
%endif
+%{_libdir}/monetdb5/createdb/*.sql
+%{_libdir}/monetdb5/sql*.mal
+%if %{bits} == 64
%exclude %{_libdir}/monetdb5/createdb/*_hge.sql
-%{_libdir}/monetdb5/createdb/*.sql
%exclude %{_libdir}/monetdb5/sql*_hge.mal
-%{_libdir}/monetdb5/sql*.mal
+%endif
%doc %{_mandir}/man1/monetdb.1.gz
%doc %{_mandir}/man1/monetdbd.1.gz
%dir %{_datadir}/doc/MonetDB-SQL
%docdir %{_datadir}/doc/MonetDB-SQL
%{_datadir}/doc/MonetDB-SQL/*
+%if %{bits} == 64
%package SQL-server5-hugeint
Summary: MonetDB5 128 bit integer (hugeint) support for SQL
Group: Applications/Databases
@@ -811,6 +823,7 @@ frontend of MonetDB.
%{_libdir}/monetdb5/autoload/??_sql_hge.mal
%{_libdir}/monetdb5/createdb/*_hge.sql
%{_libdir}/monetdb5/sql*_hge.mal
+%endif
%package -n python-monetdb
Summary: Native MonetDB client Python API
@@ -957,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
@@ -983,6 +996,140 @@ rm -f %{buildroot}%{_bindir}/Maddlog
%postun -p /sbin/ldconfig
%changelog
+* 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
+- BZ#3365: Unable to grant object privileges while having a non-default
+ current_role
+- BZ#3476: Cannot revoke object access
+- BZ#3556: when 2 multiplexed functions in MAL plan, only one is mapped
+ correctly to bat<mod>.function primitive
+- BZ#3564: Request: add support for postgresql specific scalar function:
+ split_part(string text, delimiter text, field int)
+- BZ#3625: SIGSEGV because mat array can overrun in opt_mergetable.c
+- BZ#3627: SQRT in CASE does not work as of Oct2014
+- BZ#3654: configure --enable-fits requires extra commands after creating
+ a database instance
+- BZ#3673: mclient 'expanded' row formatter
+- BZ#3674: Obfuscate event tracing
+- BZ#3679: No error is given when incorrect timezone value is specified
+ for a timetz column
+- BZ#3686: Wrong associativity of multiply/divide
+- BZ#3702: Filter function not found if created in a user schema
+- BZ#3708: wrong scoping for cross-schema view references
+- BZ#3716: alter table my_merge_table drop table t1; crashes mserver5
+ with Segmentation fault
+- BZ#3724: Wrong size calculation in BATsubjoin
+- BZ#3732: memory leak (of InstrRecord) in opt_mergetable
+- BZ#3733: "(TRUE OR <Exp>) AND <Exp>" is evaluated incorrectly
+- BZ#3735: python connection with unix_socket
+- BZ#3736: crash if mclient disconnects abruptly during a query
+- BZ#3738: Database inconsistency when using savepoint
+- BZ#3739: CASE statements do not handle NULLs in the IN () operator
+ properly
+- BZ#3740: select epoch(now()); types timestamptz(7,0) and bigint(64,0)
+ are not equal
+- BZ#3742: Division By Zero
+- BZ#3744: cast to int gives different results for decimal than double
+- BZ#3747: joins fail in the presence of nulls
+- BZ#3748: Missing META-INF/services/java.sql.Driver in JDBC package
+- BZ#3753: Hang on json field parsing
+- BZ#3754: select from a REMOTE TABLE referring local table crashes
+ mserver5
+- BZ#3756: column type conversion sticks to subsequent queries
+- BZ#3759: select data from "sys"."rejects" returns unexpected error and
+ when next select data from "sys"."sessions" causes an assertion failure
+ in mal_interpreter.c:646.
+- BZ#3760: SQL parser has problem with (position of) a scalar subquery
+ in a SELECT-list
+- BZ#3761: SQL executor has problem with (position of) a subquery in a
+ SELECT-list. Inconsistent behavior.
+- BZ#3764: DROPping multiple users causes a crash
+- BZ#3765: Re-granting a revoked privilege does not work
+- BZ#3766: VIEW not visible if created under a different schema
+- BZ#3767: CREATE TEMP TABLE using "LIKE" incorrectly handled
+- BZ#3769: SIGSEGV when combining a cast/column alias with a UNION
+ ALL view
+- BZ#3770: combined conditions on declared table in User Defined Function
+ definition crashes monetdb
+- BZ#3771: Owner of the schema loses rights if assumes the monetdb role.
+- BZ#3772: Any user can grant a role.
+- BZ#3773: quantile(col, 0) and quantile(col, 1) fail
+- BZ#3774: mclient is unaware of merge tables and remote tables
+- BZ#3775: COPY INTO: Backslash preceding field separator kills import
+- BZ#3778: Crash on remote table schema mismatch
+- BZ#3779: server crashes on MAX() on SELECT DISTINCT something combo
+
+* Thu Aug 6 2015 Martin van Dinther <martin.van.dint...@monetdbsolutions.com>
- 11.21.1-20150807
+- 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 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
+ support this.
+
+* Thu Jul 16 2015 Sjoerd Mullender <sjo...@acm.org> - 11.21.1-20150807
+- java: We now compile the Java classes using the latest Java 1.8 version, and
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
