Changeset: 9c6500291eca for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9c6500291eca
Added Files:
geom/BugTracker/Tests/copy_into_mbr.3492.modules
geom/BugTracker/Tests/copy_into_mbr.3492.sql
geom/BugTracker/Tests/copy_into_mbr.3492.stable.err
geom/BugTracker/Tests/copy_into_mbr.3492.stable.out
sql/test/BugTracker-2014/Tests/boolean_not.Bug-3505.sql
sql/test/BugTracker-2014/Tests/boolean_not.Bug-3505.stable.err
sql/test/BugTracker-2014/Tests/boolean_not.Bug-3505.stable.out
sql/test/BugTracker-2014/Tests/bug_in_cse.Bug-3511.sql
sql/test/BugTracker-2014/Tests/bug_in_cse.Bug-3511.stable.err
sql/test/BugTracker-2014/Tests/bug_in_cse.Bug-3511.stable.out
sql/test/BugTracker-2014/Tests/non_groupby_column.Bug-3524.sql
sql/test/BugTracker-2014/Tests/non_groupby_column.Bug-3524.stable.err
sql/test/BugTracker-2014/Tests/non_groupby_column.Bug-3524.stable.out
sql/test/BugTracker-2014/Tests/oid-table-assert.Bug-3514.sql
sql/test/BugTracker-2014/Tests/oid-table-assert.Bug-3514.stable.err
sql/test/BugTracker-2014/Tests/oid-table-assert.Bug-3514.stable.out
sql/test/BugTracker-2014/Tests/orderby_count.Bug-3526.sql
sql/test/BugTracker-2014/Tests/orderby_count.Bug-3526.stable.err
sql/test/BugTracker-2014/Tests/orderby_count.Bug-3526.stable.out
sql/test/BugTracker-2014/Tests/round-properties.Bug-3515.sql
sql/test/BugTracker-2014/Tests/round-properties.Bug-3515.stable.err
sql/test/BugTracker-2014/Tests/round-properties.Bug-3515.stable.out
sql/test/BugTracker-2014/Tests/select_in_crash.Bug-3491.sql
sql/test/BugTracker-2014/Tests/select_in_crash.Bug-3491.stable.err
sql/test/BugTracker-2014/Tests/select_in_crash.Bug-3491.stable.out
sql/test/BugTracker-2014/Tests/stringfloatshtcompare.Bug-3512.sql
sql/test/BugTracker-2014/Tests/stringfloatshtcompare.Bug-3512.stable.err
sql/test/BugTracker-2014/Tests/stringfloatshtcompare.Bug-3512.stable.out
sql/test/BugTracker-2014/Tests/union_with_subqueries.Bug-3518.sql
sql/test/BugTracker-2014/Tests/union_with_subqueries.Bug-3518.stable.err
sql/test/BugTracker-2014/Tests/union_with_subqueries.Bug-3518.stable.out
sql/test/BugTracker-2014/Tests/unsafe_project_push_down.Bug-3523.sql
sql/test/BugTracker-2014/Tests/unsafe_project_push_down.Bug-3523.stable.err
sql/test/BugTracker-2014/Tests/unsafe_project_push_down.Bug-3523.stable.out
sql/test/BugTracker-2014/Tests/uppercaseboolean.Bug-3519.sql
sql/test/BugTracker-2014/Tests/uppercaseboolean.Bug-3519.stable.err
sql/test/BugTracker-2014/Tests/uppercaseboolean.Bug-3519.stable.out
sql/test/BugTracker-2014/Tests/varchar_conversion_crash.Bug-3506.sql
sql/test/BugTracker-2014/Tests/varchar_conversion_crash.Bug-3506.stable.err
sql/test/BugTracker-2014/Tests/varchar_conversion_crash.Bug-3506.stable.out
sql/test/pg_regress/monetdb/abstime.sql
sql/test/pg_regress/monetdb/aggregates.sql
sql/test/pg_regress/monetdb/alter_table.sql
sql/test/pg_regress/monetdb/arrays.sql
sql/test/pg_regress/monetdb/bit.sql
sql/test/pg_regress/monetdb/boolean.sql
sql/test/pg_regress/monetdb/box.sql
sql/test/pg_regress/monetdb/btree_index.sql
sql/test/pg_regress/monetdb/case.sql
sql/test/pg_regress/monetdb/circle.sql
sql/test/pg_regress/monetdb/cluster.sql
sql/test/pg_regress/monetdb/comments.sql
sql/test/pg_regress/monetdb/conversion.sql
sql/test/pg_regress/monetdb/copy2.sql
sql/test/pg_regress/monetdb/create_aggregate.sql
sql/test/pg_regress/monetdb/create_index.sql
sql/test/pg_regress/monetdb/create_misc.sql
sql/test/pg_regress/monetdb/create_operator.sql
sql/test/pg_regress/monetdb/create_type.sql
sql/test/pg_regress/monetdb/create_view.sql
sql/test/pg_regress/monetdb/date.sql
sql/test/pg_regress/monetdb/domain.sql
sql/test/pg_regress/monetdb/drop.sql
sql/test/pg_regress/monetdb/errors.sql
sql/test/pg_regress/monetdb/float4.sql
sql/test/pg_regress/monetdb/float8.sql
sql/test/pg_regress/monetdb/foreign_key.sql
sql/test/pg_regress/monetdb/geometry.sql
sql/test/pg_regress/monetdb/hash_index.sql
sql/test/pg_regress/monetdb/horology.sql
sql/test/pg_regress/monetdb/inet.sql
sql/test/pg_regress/monetdb/inherit.sql
sql/test/pg_regress/monetdb/insert.sql
sql/test/pg_regress/monetdb/int2.sql
sql/test/pg_regress/monetdb/int4.sql
sql/test/pg_regress/monetdb/int8.sql
sql/test/pg_regress/monetdb/interval.sql
sql/test/pg_regress/monetdb/join.sql
sql/test/pg_regress/monetdb/limit.sql
sql/test/pg_regress/monetdb/lseg.sql
sql/test/pg_regress/monetdb/mule_internal.sql
sql/test/pg_regress/monetdb/name.sql
sql/test/pg_regress/monetdb/namespace.sql
sql/test/pg_regress/monetdb/numeric.sql
sql/test/pg_regress/monetdb/numeric_big.sql
sql/test/pg_regress/monetdb/numerology.sql
sql/test/pg_regress/monetdb/oid.sql
sql/test/pg_regress/monetdb/oidjoins.sql
sql/test/pg_regress/monetdb/opr_sanity.sql
sql/test/pg_regress/monetdb/path.sql
sql/test/pg_regress/monetdb/plpgsql.sql
sql/test/pg_regress/monetdb/point.sql
sql/test/pg_regress/monetdb/polygon.sql
sql/test/pg_regress/monetdb/polymorphism.sql
sql/test/pg_regress/monetdb/portals.sql
sql/test/pg_regress/monetdb/portals_p2.sql
sql/test/pg_regress/monetdb/prepare.sql
sql/test/pg_regress/monetdb/privileges.sql
sql/test/pg_regress/monetdb/random.sql
sql/test/pg_regress/monetdb/rangefuncs.sql
sql/test/pg_regress/monetdb/reltime.sql
sql/test/pg_regress/monetdb/rowtypes.sql
sql/test/pg_regress/monetdb/rules.sql
sql/test/pg_regress/monetdb/sanity_check.sql
sql/test/pg_regress/monetdb/select.sql
sql/test/pg_regress/monetdb/select_distinct.sql
sql/test/pg_regress/monetdb/select_distinct_on.sql
sql/test/pg_regress/monetdb/select_having.sql
sql/test/pg_regress/monetdb/select_implicit.sql
sql/test/pg_regress/monetdb/select_into.sql
sql/test/pg_regress/monetdb/select_views.sql
sql/test/pg_regress/monetdb/sequence.sql
sql/test/pg_regress/monetdb/sql_ascii.sql
sql/test/pg_regress/monetdb/stats.sql
sql/test/pg_regress/monetdb/strings.sql
sql/test/pg_regress/monetdb/subselect.sql
sql/test/pg_regress/monetdb/temp.sql
sql/test/pg_regress/monetdb/time.sql
sql/test/pg_regress/monetdb/timestamp.sql
sql/test/pg_regress/monetdb/timestamptz.sql
sql/test/pg_regress/monetdb/timetz.sql
sql/test/pg_regress/monetdb/tinterval.sql
sql/test/pg_regress/monetdb/transactions.sql
sql/test/pg_regress/monetdb/triggers.sql
sql/test/pg_regress/monetdb/truncate.sql
sql/test/pg_regress/monetdb/type_sanity.sql
sql/test/pg_regress/monetdb/union.sql
sql/test/pg_regress/monetdb/update.sql
sql/test/pg_regress/monetdb/vacuum.sql
sql/test/pg_regress/monetdb/without_oid.sql
Removed Files:
sql/test/Skyserver/Skyserver_dropMath.sql
sql/test/Skyserver/Skyserver_dropMs_functions.sql
Modified Files:
.hgtags
MonetDB.spec
NT/installer32/MonetDB-ODBC-Installer.vdproj
NT/installer32/MonetDB5-Geom-Module.vdproj
NT/installer32/MonetDB5-SQL-Installer.vdproj
NT/installer32/cv64-32.sh
NT/installer64/MonetDB-ODBC-Installer.vdproj
NT/installer64/MonetDB5-Geom-Module.vdproj
NT/installer64/MonetDB5-SQL-Installer.vdproj
NT/installer64/cv32-64.sh
NT/monetdb_config.h.in
NT/rules.msc
buildtools/ChangeLog-Archive
buildtools/ChangeLog.Jan2014
buildtools/autogen/autogen/am.py
clients/R/MonetDB.R/src/mapi.c
clients/Tests/SQL-dump.stable.out
clients/Tests/SQL-dump.stable.out.32bit
clients/Tests/SQL-dump.stable.out.64bit.oid32
clients/Tests/SQL-dump_gsl.stable.out
clients/Tests/SQL-dump_gsl.stable.out.oid32
clients/Tests/SQL-dump_nogeom.stable.out
clients/Tests/exports.stable.out
clients/mapiclient/ReadlineTools.c
clients/mapiclient/dump.c
clients/mapiclient/mclient.c
clients/mapiclient/tomograph.c
clients/mapilib/mapi.rc
clients/odbc/driver/ODBCConvert.c
clients/odbc/driver/ODBCUtil.c
clients/odbc/driver/ODBCUtil.h
clients/odbc/driver/SQLColumnPrivileges.c
clients/odbc/driver/SQLColumns.c
clients/odbc/driver/SQLGetInfo.c
clients/odbc/driver/SQLPrepare.c
clients/odbc/driver/SQLPrimaryKeys.c
clients/odbc/driver/SQLProcedures.c
clients/odbc/driver/SQLSpecialColumns.c
clients/odbc/driver/SQLStatistics.c
clients/odbc/driver/SQLTablePrivileges.c
clients/odbc/driver/driver.rc
clients/odbc/setup/Makefile.ag
clients/odbc/winsetup/Makefile.ag
clients/odbc/winsetup/setup.rc
clients/python2/monetdb/sql/monetize.py
clients/python2/setup.py
clients/python2/test/test_monetize.py
clients/python3/monetdb/sql/monetize.py
clients/python3/setup.py
clients/python3/test/test_monetize.py
common/stream/stream.c
configure.ag
debian/changelog
debian/control
gdk/gdk.h
gdk/gdk_atoms.c
gdk/gdk_bat.c
gdk/gdk_batop.c
gdk/gdk_join.c
gdk/gdk_join_legacy.c
gdk/gdk_logger.c
gdk/gdk_posix.c
gdk/gdk_private.h
gdk/gdk_sample.c
gdk/gdk_select.c
gdk/gdk_storage.c
gdk/gdk_system.h
gdk/gdk_utils.c
gdk/libbat.rc
geom/BugTracker/Tests/All
geom/monetdb5/geom.c
java/src/nl/cwi/monetdb/jdbc/MonetDatabaseMetaData.java
java/src/nl/cwi/monetdb/jdbc/MonetResultSet.java
libversions
monetdb5/extras/jaql/jaql.c
monetdb5/extras/jaql/jaqlscenario.c
monetdb5/extras/jaql/json.c
monetdb5/extras/sphinx/sphinx.c
monetdb5/mal/Tests/All
monetdb5/mal/Tests/tst913.stable.out
monetdb5/mal/mal_atom.c
monetdb5/mal/mal_authorize.c
monetdb5/mal/mal_box.c
monetdb5/mal/mal_builder.c
monetdb5/mal/mal_debugger.c
monetdb5/mal/mal_exception.c
monetdb5/mal/mal_function.c
monetdb5/mal/mal_import.c
monetdb5/mal/mal_instruction.c
monetdb5/mal/mal_interpreter.c
monetdb5/mal/mal_linker.c
monetdb5/mal/mal_listing.c
monetdb5/mal/mal_module.c
monetdb5/mal/mal_profiler.c
monetdb5/mal/mal_recycle.c
monetdb5/mal/mal_resource.c
monetdb5/modules/atoms/batxml.c
monetdb5/modules/atoms/mtime.c
monetdb5/modules/atoms/xml.c
monetdb5/modules/kernel/algebra.c
monetdb5/modules/kernel/array.c
monetdb5/modules/kernel/bat5.c
monetdb5/modules/kernel/batmmath.c
monetdb5/modules/kernel/batstr.c
monetdb5/modules/kernel/microbenchmark.c
monetdb5/modules/mal/bbp.c
monetdb5/modules/mal/clients.c
monetdb5/modules/mal/cluster.c
monetdb5/modules/mal/inspect.c
monetdb5/modules/mal/mal_mapi.c
monetdb5/modules/mal/mat.c
monetdb5/modules/mal/mdb.c
monetdb5/modules/mal/pcre.c
monetdb5/modules/mal/profiler.c
monetdb5/modules/mal/remote.c
monetdb5/modules/mal/sample.c
monetdb5/modules/mal/sample.h
monetdb5/modules/mal/sysmon.c
monetdb5/modules/mal/tablet.c
monetdb5/modules/mal/tokenizer.c
monetdb5/modules/mal/urlbox.c
monetdb5/modules/mal/zorder.c
monetdb5/optimizer/opt_dataflow.c
monetdb5/optimizer/opt_dictionary.c
monetdb5/optimizer/opt_evaluate.c
monetdb5/optimizer/opt_mergetable.c
monetdb5/optimizer/opt_octopus.c
monetdb5/optimizer/opt_pushselect.c
monetdb5/optimizer/opt_qep.c
monetdb5/optimizer/opt_remoteQueries.c
monetdb5/optimizer/opt_reorder.c
monetdb5/optimizer/opt_strengthReduction.c
monetdb5/optimizer/opt_wrapper.c
monetdb5/scheduler/run_octopus.c
monetdb5/tools/libmonetdb5.rc
sql/backends/monet5/LSST/lsst.c
sql/backends/monet5/rel_bin.c
sql/backends/monet5/sql.c
sql/backends/monet5/sql_cast.c
sql/backends/monet5/sql_optimizer.c
sql/backends/monet5/sql_result.c
sql/backends/monet5/sql_round_impl.h
sql/backends/monet5/sql_scenario.c
sql/backends/monet5/vaults/fits.c
sql/benchmarks/ssbm/Tests/01-13.reqtests
sql/benchmarks/ssbm/Tests/01-explain.reqtests
sql/benchmarks/ssbm/Tests/01-plan.reqtests
sql/benchmarks/ssbm/Tests/01.reqtests
sql/benchmarks/ssbm/Tests/02-explain.reqtests
sql/benchmarks/ssbm/Tests/02-explain.stable.out
sql/benchmarks/ssbm/Tests/02-plan.reqtests
sql/benchmarks/ssbm/Tests/02-plan.stable.out
sql/benchmarks/ssbm/Tests/02.reqtests
sql/benchmarks/ssbm/Tests/03-explain.reqtests
sql/benchmarks/ssbm/Tests/03-explain.stable.out
sql/benchmarks/ssbm/Tests/03-plan.reqtests
sql/benchmarks/ssbm/Tests/03-plan.stable.out
sql/benchmarks/ssbm/Tests/03.reqtests
sql/benchmarks/ssbm/Tests/04-explain.reqtests
sql/benchmarks/ssbm/Tests/04-plan.reqtests
sql/benchmarks/ssbm/Tests/04.reqtests
sql/benchmarks/ssbm/Tests/05-explain.reqtests
sql/benchmarks/ssbm/Tests/05-plan.reqtests
sql/benchmarks/ssbm/Tests/05.reqtests
sql/benchmarks/ssbm/Tests/06-explain.reqtests
sql/benchmarks/ssbm/Tests/06-plan.reqtests
sql/benchmarks/ssbm/Tests/06.reqtests
sql/benchmarks/ssbm/Tests/07-explain.reqtests
sql/benchmarks/ssbm/Tests/07-explain.stable.out
sql/benchmarks/ssbm/Tests/07-plan.reqtests
sql/benchmarks/ssbm/Tests/07-plan.stable.out
sql/benchmarks/ssbm/Tests/07.reqtests
sql/benchmarks/ssbm/Tests/08-explain.reqtests
sql/benchmarks/ssbm/Tests/08-explain.stable.out
sql/benchmarks/ssbm/Tests/08-plan.reqtests
sql/benchmarks/ssbm/Tests/08-plan.stable.out
sql/benchmarks/ssbm/Tests/08.reqtests
sql/benchmarks/ssbm/Tests/09-explain.reqtests
sql/benchmarks/ssbm/Tests/09-plan.reqtests
sql/benchmarks/ssbm/Tests/09.reqtests
sql/benchmarks/ssbm/Tests/10-explain.reqtests
sql/benchmarks/ssbm/Tests/10-plan.reqtests
sql/benchmarks/ssbm/Tests/10.reqtests
sql/benchmarks/ssbm/Tests/11-explain.reqtests
sql/benchmarks/ssbm/Tests/11-plan.reqtests
sql/benchmarks/ssbm/Tests/11.reqtests
sql/benchmarks/ssbm/Tests/12-explain.reqtests
sql/benchmarks/ssbm/Tests/12-plan.reqtests
sql/benchmarks/ssbm/Tests/12.reqtests
sql/benchmarks/ssbm/Tests/13-explain.reqtests
sql/benchmarks/ssbm/Tests/13-plan.reqtests
sql/benchmarks/ssbm/Tests/13.reqtests
sql/benchmarks/ssbm/Tests/check1.reqtests
sql/benchmarks/ssbm/Tests/load.reqtests
sql/benchmarks/tpch/Tests/01-explain.stable.out
sql/benchmarks/tpch/Tests/01-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/01-plan.stable.out
sql/benchmarks/tpch/Tests/03-explain.stable.out
sql/benchmarks/tpch/Tests/03-plan.stable.out
sql/benchmarks/tpch/Tests/08-explain.stable.out
sql/benchmarks/tpch/Tests/08-plan.stable.out
sql/benchmarks/tpch/Tests/17-plan.stable.out
sql/benchmarks/tpch/Tests/22-plan.stable.out
sql/common/sql_types.c
sql/jdbc/tests/Tests/Test_PSmetadata.stable.out
sql/server/rel_dump.c
sql/server/rel_exp.c
sql/server/rel_exp.h
sql/server/rel_optimizer.c
sql/server/rel_select.c
sql/server/sql_atom.c
sql/server/sql_parser.y
sql/storage/bat/bat_utils.c
sql/storage/store.c
sql/test/BugTracker-2009/Tests/old_views_incorrectly_reused.SF-2863804.stable.out
sql/test/BugTracker-2009/Tests/old_views_incorrectly_reused.SF-2863804.view1.sql
sql/test/BugTracker-2009/Tests/old_views_incorrectly_reused.SF-2863804.view2.sql
sql/test/BugTracker-2009/Tests/overflow.SF-2853458.stable.err
sql/test/BugTracker-2009/Tests/overflow.SF-2853458.stable.err.Solaris
sql/test/BugTracker-2009/Tests/overflow.SF-2853458.stable.err.Windows
sql/test/BugTracker-2009/Tests/pow_operator.SF-2812721.stable.out
sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out
sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out.32bit
sql/test/BugTracker-2013/Tests/cannot_use_columns_after_groupby.Bug-3340.stable.err
sql/test/BugTracker-2013/Tests/mitosis-floor.Bug-3330.stable.out
sql/test/BugTracker-2014/Tests/All
sql/test/BugTracker/Tests/between_with_column.SF-1959410.stable.err
sql/test/BugTracker/Tests/rank_over.SF-1691098.sql
sql/test/BugTracker/Tests/rank_over.SF-1691098.stable.out
sql/test/BugTracker/Tests/with_only_once.SF-1720293.sql
sql/test/BugTracker/Tests/with_only_once.SF-1720293.stable.out
sql/test/Skyserver/Skyserver_functions.sql
sql/test/Skyserver/Skyserver_functions_v6.sql
sql/test/Skyserver/Tests/Skyserver.SQL.py
sql/test/Skyserver/Tests/Skyserver_v6.SQL.py
sql/test/bugs/Tests/floor-bug-sf-967066.stable.out
sql/test/pg_regress/Tests/load.SQL.sh
sql/test/pg_regress/Tests/strings_cast.stable.err
sql/test/pg_regress/Tests/strings_cast.stable.out
sql/test/pg_regress/monetdb/char.sql
sql/test/pg_regress/postgresql2sql99.sh
testing/Mtest.py.in
testing/quicktest
tools/merovingian/daemon/argvcmds.c
tools/merovingian/daemon/client.c
tools/merovingian/daemon/controlrunner.c
tools/merovingian/daemon/proxy.c
tools/merovingian/utils/control.c
tools/merovingian/utils/database.c
tools/merovingian/utils/properties.c
tools/merovingian/utils/properties.h
vertoo.data
Branch: xid
Log Message:
Merged with Jan2014 branch.
diffs (truncated from 34001 to 300 lines):
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -564,3 +564,11 @@ fa6872e2a8cf8bb3b4fb25a3b356946316f52a6b
242fe4b4960f54c339f7a6fb79aedd8f3b5e217a Jan2014_SP1_release
c91c4d792dee1074ce6f489e94ce4bfc480edfb3 Jan2014_15
13e1b24f442791f5ab790fa77453d3bd4e88a9c8 Jan2014_SP2_release
+c3051f066a9eea814487dfb0b7cf7070ae16cd21 Jan2014_17
+13e1b24f442791f5ab790fa77453d3bd4e88a9c8 Jan2014_SP2_release
+389f5f0d4c43ab689e31c28e01b43c8b7ba8de9c Jan2014_SP2_release
+dc158ade928d0305f3f0e7ef9613dd81329f613d Jan2014_19
+0218c4ec31068bd1b9be7d2bb1ccad31e17e8d5f Jan2014_SP3_release
+6830d0b9c31fe23954c75014a581f145c7a551ff Jan2014_21
+0218c4ec31068bd1b9be7d2bb1ccad31e17e8d5f Jan2014_SP3_release
+6c7d5f562fcb044b745c871344c25b1c6bab7cf4 Jan2014_SP3_release
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -1,5 +1,5 @@
%define name MonetDB
-%define version 11.17.17
+%define version 11.17.22
%{!?buildno: %define buildno %(date +%Y%m%d)}
# groups of related archs
@@ -45,14 +45,14 @@ 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/Jan2014-SP2/%{name}-%{version}.tar.bz2
+Source:
http://dev.monetdb.org/downloads/sources/Jan2014-SP3/%{name}-%{version}.tar.bz2
BuildRequires: bison
BuildRequires: bzip2-devel
# BuildRequires: cfitsio-devel
BuildRequires: flex
%if %{?with_geos:1}%{!?with_geos:0}
-BuildRequires: geos-devel >= 2.2.0
+BuildRequires: geos-devel >= 3.0.0
%endif
BuildRequires: gsl-devel
BuildRequires: libcurl-devel
@@ -525,11 +525,14 @@ fi
%exclude %{_libdir}/monetdb5/jaql*.mal
%exclude %{_libdir}/monetdb5/json*.mal
%{_libdir}/monetdb5/*.mal
-# %{_libdir}/monetdb5/autoload/*_fits.mal
-%{_libdir}/monetdb5/autoload/*_lsst.mal
-%{_libdir}/monetdb5/autoload/*_opt_sql_append.mal
-%{_libdir}/monetdb5/autoload/*_udf.mal
-%{_libdir}/monetdb5/autoload/*_vault.mal
+%if %{?with_geos:1}%{!?with_geos:0}
+%exclude %{_libdir}/monetdb5/autoload/*_geom.mal
+%endif
+%exclude %{_libdir}/monetdb5/autoload/*_gsl.mal
+%exclude %{_libdir}/monetdb5/autoload/*_jaql.mal
+# %exclude %{_libdir}/monetdb5/autoload/*_rdf.mal
+%exclude %{_libdir}/monetdb5/autoload/*_sql.mal
+%{_libdir}/monetdb5/autoload/*.mal
%if %{?with_geos:1}%{!?with_geos:0}
%exclude %{_libdir}/monetdb5/lib_geom.so
%endif
@@ -586,9 +589,9 @@ used from the MAL level.
Summary: MonetDB5 SQL server modules
Group: Applications/Databases
Requires: MonetDB5-server = %{version}-%{release}
-%if %{?rhel:0}%{!?rhel:1}
-# for systemd-tmpfiles
-Requires: systemd-units
+%if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} >= 7
+# RHEL >= 7, and all current Fedora
+Requires: %{_bindir}/systemd-tmpfiles
%endif
Obsoletes: MonetDB-SQL-devel
Obsoletes: %{name}-SQL
@@ -602,7 +605,7 @@ accelerators. It also has an SQL fronte
This package contains the SQL frontend for MonetDB. If you want to
use SQL with MonetDB, you will need to install this package.
-%if %{?rhel:0}%{!?rhel:1}
+%if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} >= 7
%post SQL-server5
systemd-tmpfiles --create %{_sysconfdir}/tmpfiles.d/monetdbd.conf
%endif
@@ -612,11 +615,11 @@ systemd-tmpfiles --create %{_sysconfdir}
%{_bindir}/monetdb
%{_bindir}/monetdbd
%dir %attr(775,monetdb,monetdb) %{_localstatedir}/log/monetdb
-%if %{?rhel:0}%{!?rhel:1}
-# Fedora 15 and newer
+%if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} >= 7
+# RHEL >= 7, and all current Fedora
%{_sysconfdir}/tmpfiles.d/monetdbd.conf
%else
-# RedHat Enterprise Linux
+# RedHat Enterprise Linux < 7
%dir %attr(775,monetdb,monetdb) %{_localstatedir}/run/monetdb
%exclude %{_sysconfdir}/tmpfiles.d/monetdbd.conf
%endif
@@ -827,6 +830,24 @@ mv $RPM_BUILD_ROOT%{_datadir}/doc/MonetD
rm -fr $RPM_BUILD_ROOT
%changelog
+* Fri Jul 25 2014 Sjoerd Mullender <[email protected]> - 11.17.21-20140725
+- Rebuilt.
+- BZ#3519: Uppercase TRUE/FALSE strings cannot be converted to boolean
+ values
+
+* Tue Jul 22 2014 Sjoerd Mullender <[email protected]> - 11.17.19-20140722
+- Rebuilt.
+- BZ#3487: dead link to "Professional services"
+- BZ#3500: MonetDB driver wants an empty string for SQLTables and
+ SQLColumns API calls, where other drivers expect NULL
+- BZ#3514: mserver5 crash due (assertion failure in gdk_select.c)
+- BZ#3515: mserver5 crash due (assertion failure in gdk_bat.c)
+
+* Tue Jun 3 2014 Sjoerd Mullender <[email protected]> - 11.17.19-20140722
+- buildtools: Fix configure to continue without Python if the python binary is
+ too old. This instead of always aborting configure if python happens
+ to be too old.
+
* Wed May 14 2014 Sjoerd Mullender <[email protected]> - 11.17.17-20140514
- Rebuilt.
- BZ#3482: Crossproduct error
diff --git a/NT/installer32/MonetDB-ODBC-Installer.vdproj
b/NT/installer32/MonetDB-ODBC-Installer.vdproj
--- a/NT/installer32/MonetDB-ODBC-Installer.vdproj
+++ b/NT/installer32/MonetDB-ODBC-Installer.vdproj
@@ -566,15 +566,15 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:MonetDB ODBC Driver"
- "ProductCode" = "8:{089BF3EC-8C43-48FF-BC98-D98D3AAE525D}"
- "PackageCode" = "8:{0232FABC-DCD8-4C73-88B7-E8BCE875B70F}"
+ "ProductCode" = "8:{FB3E2884-9303-41C5-BD71-82E515DB4A94}"
+ "PackageCode" = "8:{C82F4EA3-4726-4921-BD50-D0C849993261}"
"UpgradeCode" = "8:{C1F69378-3F5C-4120-8224-32F07D3458F3}"
"AspNetVersion" = "8:4.0.30319.0"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:11.17.17"
+ "ProductVersion" = "8:11.17.22"
"Manufacturer" = "8:MonetDB"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:http://www.monetdb.org/";
@@ -1207,7 +1207,7 @@
{
"UseDynamicProperties" = "11:TRUE"
"IsDependency" = "11:FALSE"
- "SourcePath" = "8:C:\\Program Files (x86)\\Common Files\\Merge
Modules\\Microsoft_VC100_CRT_x86.msm"
+ "SourcePath" = "8:C:\\Program Files\\Common Files\\Merge
Modules\\Microsoft_VC100_CRT_x86.msm"
"Properties"
{
}
diff --git a/NT/installer32/MonetDB5-Geom-Module.vdproj
b/NT/installer32/MonetDB5-Geom-Module.vdproj
--- a/NT/installer32/MonetDB5-Geom-Module.vdproj
+++ b/NT/installer32/MonetDB5-Geom-Module.vdproj
@@ -94,11 +94,6 @@
"ComponentsUrl" = "8:"
"Items"
{
-
"{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:Microsoft.Windows.Installer.2.0"
- {
- "Name" = "8:Windows Installer 2.0"
- "ProductCode" = "8:Microsoft.Windows.Installer.2.0"
- }
}
}
}
@@ -425,14 +420,15 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:MonetDB5 SQL GIS Module"
- "ProductCode" = "8:{808008B3-C232-4AE8-AA63-95B058C81DE1}"
- "PackageCode" = "8:{9F5B798E-389F-4932-9C8C-4FC45A832968}"
+ "ProductCode" = "8:{41BB920D-0B90-472E-9852-5C549C264E09}"
+ "PackageCode" = "8:{3BFDBBA9-65F0-4471-BFB4-9C536929378A}"
"UpgradeCode" = "8:{92C89C36-0E86-45E1-B3D8-0D6C91108F30}"
+ "AspNetVersion" = "8:4.0.30319.0"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:11.17.17"
+ "ProductVersion" = "8:11.17.22"
"Manufacturer" = "8:MonetDB"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:http://www.monetdb.org/";
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
@@ -1030,11 +1030,6 @@
"ComponentsUrl" = "8:"
"Items"
{
-
"{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:Microsoft.Windows.Installer.2.0"
- {
- "Name" = "8:Windows Installer 2.0"
- "ProductCode" = "8:Microsoft.Windows.Installer.2.0"
- }
}
}
}
@@ -2407,7 +2402,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_667BD650736E43C9A8B6899179FA0CAA"
{
- "SourcePath" =
"8:share\\doc\\MonetDB-SQL-11.17.17\\dump-restore.txt"
+ "SourcePath" =
"8:share\\doc\\MonetDB-SQL-11.17.22\\dump-restore.txt"
"TargetName" = "8:dump-restore.txt"
"Tag" = "8:"
"Folder" = "8:_6C21CE578F0941D09FDD9951A229FF37"
@@ -3207,7 +3202,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A9DB6CF8297A4BEEAF7A6D4958A4B0D6"
{
- "SourcePath" =
"8:share\\doc\\MonetDB-SQL-11.17.17\\dump-restore.html"
+ "SourcePath" =
"8:share\\doc\\MonetDB-SQL-11.17.22\\dump-restore.html"
"TargetName" = "8:dump-restore.html"
"Tag" = "8:"
"Folder" = "8:_6C21CE578F0941D09FDD9951A229FF37"
@@ -4511,7 +4506,7 @@
{
"{9EF0B969-E518-4E46-987F-47570745A589}:_6C21CE578F0941D09FDD9951A229FF37"
{
- "Name" = "8:MonetDB-SQL-11.17.17"
+ "Name" = "8:MonetDB-SQL-11.17.22"
"AlwaysCreate" = "11:FALSE"
"Condition" = "8:"
"Transitive" = "11:FALSE"
@@ -4553,15 +4548,15 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:MonetDB5"
- "ProductCode" = "8:{D12286F7-EA83-4E6D-B4E7-20565C78C554}"
- "PackageCode" = "8:{8A52E677-1A8C-4C03-AC7E-0087B519C751}"
+ "ProductCode" = "8:{9889051A-8D0B-41B1-B20E-E7312769D199}"
+ "PackageCode" = "8:{C5B3BE68-86B9-4653-A9A1-D2D6B5050FE7}"
"UpgradeCode" = "8:{730C595B-DBA6-48D7-94B8-A98780AC92B6}"
"AspNetVersion" = "8:4.0.30319.0"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:11.17.17"
+ "ProductVersion" = "8:11.17.22"
"Manufacturer" = "8:MonetDB"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:http://www.monetdb.org/";
diff --git a/NT/installer32/cv64-32.sh b/NT/installer32/cv64-32.sh
--- a/NT/installer32/cv64-32.sh
+++ b/NT/installer32/cv64-32.sh
@@ -19,13 +19,13 @@
# this script is mostly to document what I did, not for regular use.
cp ../installer64/*.{vdproj,sln} .
-sed -i -e '/TargetPlatform/s/3:1/3:0/' \
- -e 's/win64/win32/' \
- -e 's/\[ProgramFiles64Folder\]/[ProgramFilesFolder]/' \
- -e 's/C:\\\\Program Files.*\\\\Common Files\\\\Merge
Modules\\\\Microsoft_VC100_CRT_x64.msm/C:\\\\Program Files\\\\Common
Files\\\\Merge Modules\\\\Microsoft_VC100_CRT_x86.msm/' \
- -e 's/"ProductCode" = "8:{.*/"ProductCode" =
"8:{66BABD32-D69D-4A89-A7F3-2655D4CD0641}"/' \
- -e 's/"PackageCode" = "8:{.*/"PackageCode" =
"8:{D9B2D386-1461-43BC-9A63-93F1BA0D7921}"/' \
- -e 's/"UpgradeCode" =
"8:{95ACBC8C-BC4B-4901-AF70-48B54A5C20F7}"/"UpgradeCode" =
"8:{C1F69378-3F5C-4120-8224-32F07D3458F3}"/' \
- -e 's/"UpgradeCode" =
"8:{8E6CDFDE-39B9-43D9-97B3-2440C012845C}"/"UpgradeCode" =
"8:{92C89C36-0E86-45E1-B3D8-0D6C91108F30}"/' \
- -e 's/"UpgradeCode" =
"8:{839D3C90-B578-41E2-A004-431440F9E899}"/"UpgradeCode" =
"8:{730C595B-DBA6-48D7-94B8-A98780AC92B6}"/' \
+sed -i~ -e '/TargetPlatform/s/3:1/3:0/' \
+ -e 's/win64/win32/' \
+ -e 's/\[ProgramFiles64Folder\]/[ProgramFilesFolder]/' \
+ -e 's/C:\\\\Program Files.*\\\\Common Files\\\\Merge
Modules\\\\Microsoft_VC100_CRT_x64.msm/C:\\\\Program Files\\\\Common
Files\\\\Merge Modules\\\\Microsoft_VC100_CRT_x86.msm/' \
+ -e 's/"ProductCode" = "8:{.*/"ProductCode" =
"8:{66BABD32-D69D-4A89-A7F3-2655D4CD0641}"/' \
+ -e 's/"PackageCode" = "8:{.*/"PackageCode" =
"8:{D9B2D386-1461-43BC-9A63-93F1BA0D7921}"/' \
+ -e 's/"UpgradeCode" =
"8:{95ACBC8C-BC4B-4901-AF70-48B54A5C20F7}"/"UpgradeCode" =
"8:{C1F69378-3F5C-4120-8224-32F07D3458F3}"/' \
+ -e 's/"UpgradeCode" =
"8:{8E6CDFDE-39B9-43D9-97B3-2440C012845C}"/"UpgradeCode" =
"8:{92C89C36-0E86-45E1-B3D8-0D6C91108F30}"/' \
+ -e 's/"UpgradeCode" =
"8:{839D3C90-B578-41E2-A004-431440F9E899}"/"UpgradeCode" =
"8:{730C595B-DBA6-48D7-94B8-A98780AC92B6}"/' \
*.vdproj
diff --git a/NT/installer64/MonetDB-ODBC-Installer.vdproj
b/NT/installer64/MonetDB-ODBC-Installer.vdproj
--- a/NT/installer64/MonetDB-ODBC-Installer.vdproj
+++ b/NT/installer64/MonetDB-ODBC-Installer.vdproj
@@ -566,15 +566,15 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:MonetDB ODBC Driver"
- "ProductCode" = "8:{093B4B51-EB5B-4C31-8D20-A2D7C52659E9}"
- "PackageCode" = "8:{7FF991C3-F9A2-4E70-ABB4-F8A6881F3BB7}"
+ "ProductCode" = "8:{1E63F1E7-AF33-48CF-A9FF-86C9139B1E5E}"
+ "PackageCode" = "8:{0235EFA4-9AB7-4B07-97FD-E345DEAE2E09}"
"UpgradeCode" = "8:{95ACBC8C-BC4B-4901-AF70-48B54A5C20F7}"
"AspNetVersion" = "8:4.0.30319.0"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:11.17.17"
+ "ProductVersion" = "8:11.17.22"
"Manufacturer" = "8:MonetDB"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:http://www.monetdb.org/";
@@ -1207,7 +1207,7 @@
{
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
