Changeset: 714c04e9316e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=714c04e9316e
Added Files:
monetdb5/modules/mal/Tests/pqueue3.mal
sql/benchmarks/tpch/drop.sql
sql/test/BugTracker-2014/Tests/integer-cast.Bug-3424.sql
sql/test/BugTracker-2014/Tests/integer-cast.Bug-3424.stable.err
sql/test/BugTracker-2014/Tests/integer-cast.Bug-3424.stable.out
sql/test/BugTracker-2014/Tests/local-temp-1.Bug-3468.sql
sql/test/BugTracker-2014/Tests/local-temp-1.Bug-3468.stable.err
sql/test/BugTracker-2014/Tests/local-temp-1.Bug-3468.stable.out
sql/test/BugTracker-2014/Tests/local-temp-2.Bug-3468.sql
sql/test/BugTracker-2014/Tests/local-temp-2.Bug-3468.stable.err
sql/test/BugTracker-2014/Tests/local-temp-2.Bug-3468.stable.out
sql/test/BugTracker-2014/Tests/python-microseconds.Bug-3439.SQL.py
sql/test/BugTracker-2014/Tests/python-microseconds.Bug-3439.stable.err
sql/test/BugTracker-2014/Tests/python-microseconds.Bug-3439.stable.out
sql/test/BugTracker-2014/Tests/temporary.Bug-3430.stable.err
sql/test/BugTracker-2014/Tests/temporary.Bug-3430.stable.out
sql/test/Tests/alastair_udf_mergetable_bug.py
sql/test/Tests/alastair_udf_mergetable_bug.stable.err
sql/test/Tests/alastair_udf_mergetable_bug.stable.out
Removed Files:
debian/monetdb5-jaql.install
monetdb5/extras/jaql/30_jaql.mal
monetdb5/extras/jaql/Makefile.ag
monetdb5/extras/jaql/Tests/All
monetdb5/extras/jaql/Tests/expand00.mal
monetdb5/extras/jaql/Tests/expand00.stable.err
monetdb5/extras/jaql/Tests/expand00.stable.out
monetdb5/extras/jaql/Tests/expand01.mal
monetdb5/extras/jaql/Tests/expand01.stable.err
monetdb5/extras/jaql/Tests/expand01.stable.out
monetdb5/extras/jaql/Tests/filter00.mal
monetdb5/extras/jaql/Tests/filter00.stable.err
monetdb5/extras/jaql/Tests/filter00.stable.out
monetdb5/extras/jaql/Tests/filter01.mal
monetdb5/extras/jaql/Tests/filter01.stable.err
monetdb5/extras/jaql/Tests/filter01.stable.out
monetdb5/extras/jaql/Tests/func00.mal
monetdb5/extras/jaql/Tests/func00.stable.err
monetdb5/extras/jaql/Tests/func00.stable.out
monetdb5/extras/jaql/Tests/func01.mal
monetdb5/extras/jaql/Tests/func01.stable.err
monetdb5/extras/jaql/Tests/func01.stable.out
monetdb5/extras/jaql/Tests/group00.mal
monetdb5/extras/jaql/Tests/group00.stable.err
monetdb5/extras/jaql/Tests/group00.stable.out
monetdb5/extras/jaql/Tests/group01.mal
monetdb5/extras/jaql/Tests/group01.stable.err
monetdb5/extras/jaql/Tests/group01.stable.out
monetdb5/extras/jaql/Tests/group02.mal
monetdb5/extras/jaql/Tests/group02.stable.err
monetdb5/extras/jaql/Tests/group02.stable.out
monetdb5/extras/jaql/Tests/join00.mal
monetdb5/extras/jaql/Tests/join00.stable.err
monetdb5/extras/jaql/Tests/join00.stable.out
monetdb5/extras/jaql/Tests/join01.mal
monetdb5/extras/jaql/Tests/join01.stable.err
monetdb5/extras/jaql/Tests/join01.stable.out
monetdb5/extras/jaql/Tests/join02.mal
monetdb5/extras/jaql/Tests/join02.stable.err
monetdb5/extras/jaql/Tests/join02.stable.out
monetdb5/extras/jaql/Tests/join03.mal
monetdb5/extras/jaql/Tests/join03.stable.err
monetdb5/extras/jaql/Tests/join03.stable.out
monetdb5/extras/jaql/Tests/json00.mal
monetdb5/extras/jaql/Tests/json00.stable.err
monetdb5/extras/jaql/Tests/json00.stable.out
monetdb5/extras/jaql/Tests/json01.mal
monetdb5/extras/jaql/Tests/json01.stable.err
monetdb5/extras/jaql/Tests/json01.stable.out
monetdb5/extras/jaql/Tests/json02.mal
monetdb5/extras/jaql/Tests/json02.stable.err
monetdb5/extras/jaql/Tests/json02.stable.out
monetdb5/extras/jaql/Tests/json03.mal
monetdb5/extras/jaql/Tests/json03.stable.err
monetdb5/extras/jaql/Tests/json03.stable.out
monetdb5/extras/jaql/Tests/json04.mal
monetdb5/extras/jaql/Tests/json04.stable.err
monetdb5/extras/jaql/Tests/json04.stable.out
monetdb5/extras/jaql/Tests/json05.mal
monetdb5/extras/jaql/Tests/json05.stable.err
monetdb5/extras/jaql/Tests/json05.stable.out
monetdb5/extras/jaql/Tests/plan00.mal
monetdb5/extras/jaql/Tests/plan00.stable.err
monetdb5/extras/jaql/Tests/plan00.stable.out
monetdb5/extras/jaql/Tests/plan01.mal
monetdb5/extras/jaql/Tests/plan01.stable.err
monetdb5/extras/jaql/Tests/plan01.stable.out
monetdb5/extras/jaql/Tests/plan02.mal
monetdb5/extras/jaql/Tests/plan02.stable.err
monetdb5/extras/jaql/Tests/plan02.stable.out
monetdb5/extras/jaql/Tests/sort00.mal
monetdb5/extras/jaql/Tests/sort00.stable.err
monetdb5/extras/jaql/Tests/sort00.stable.out
monetdb5/extras/jaql/Tests/sort01.mal
monetdb5/extras/jaql/Tests/sort01.stable.err
monetdb5/extras/jaql/Tests/sort01.stable.out
monetdb5/extras/jaql/Tests/top00.mal
monetdb5/extras/jaql/Tests/top00.stable.err
monetdb5/extras/jaql/Tests/top00.stable.out
monetdb5/extras/jaql/Tests/top01.mal
monetdb5/extras/jaql/Tests/top01.stable.err
monetdb5/extras/jaql/Tests/top01.stable.out
monetdb5/extras/jaql/Tests/transform00.mal
monetdb5/extras/jaql/Tests/transform00.stable.err
monetdb5/extras/jaql/Tests/transform00.stable.out
monetdb5/extras/jaql/Tests/transform01.mal
monetdb5/extras/jaql/Tests/transform01.stable.err
monetdb5/extras/jaql/Tests/transform01.stable.out
monetdb5/extras/jaql/Tests/transform02.mal
monetdb5/extras/jaql/Tests/transform02.stable.err
monetdb5/extras/jaql/Tests/transform02.stable.out
monetdb5/extras/jaql/Tests/variable00.mal
monetdb5/extras/jaql/Tests/variable00.stable.err
monetdb5/extras/jaql/Tests/variable00.stable.out
monetdb5/extras/jaql/jaql.c
monetdb5/extras/jaql/jaql.h
monetdb5/extras/jaql/jaql.mal
monetdb5/extras/jaql/jaqlfunc.mal
monetdb5/extras/jaql/jaqlgencode.c
monetdb5/extras/jaql/jaqlgencode.h
monetdb5/extras/jaql/jaqlscenario.c
monetdb5/extras/jaql/jaqlscenario.h
monetdb5/extras/jaql/jaqltests/Tests/All
monetdb5/extras/jaql/jaqltests/Tests/calculations.jaql
monetdb5/extras/jaql/jaqltests/Tests/calculations.stable.err
monetdb5/extras/jaql/jaqltests/Tests/calculations.stable.out
monetdb5/extras/jaql/jaqltests/Tests/documents.jaql
monetdb5/extras/jaql/jaqltests/Tests/documents.stable.err
monetdb5/extras/jaql/jaqltests/Tests/documents.stable.out
monetdb5/extras/jaql/jaqltests/Tests/expand.jaql
monetdb5/extras/jaql/jaqltests/Tests/expand.stable.err
monetdb5/extras/jaql/jaqltests/Tests/expand.stable.out
monetdb5/extras/jaql/jaqltests/Tests/filter.jaql
monetdb5/extras/jaql/jaqltests/Tests/filter.stable.err
monetdb5/extras/jaql/jaqltests/Tests/filter.stable.out
monetdb5/extras/jaql/jaqltests/Tests/group.jaql
monetdb5/extras/jaql/jaqltests/Tests/group.stable.err
monetdb5/extras/jaql/jaqltests/Tests/group.stable.out
monetdb5/extras/jaql/jaqltests/Tests/imenu.json
monetdb5/extras/jaql/jaqltests/Tests/in.jaql
monetdb5/extras/jaql/jaqltests/Tests/in.stable.err
monetdb5/extras/jaql/jaqltests/Tests/in.stable.out
monetdb5/extras/jaql/jaqltests/Tests/info.jaql
monetdb5/extras/jaql/jaqltests/Tests/info.stable.err
monetdb5/extras/jaql/jaqltests/Tests/info.stable.out
monetdb5/extras/jaql/jaqltests/Tests/join.jaql
monetdb5/extras/jaql/jaqltests/Tests/join.stable.err
monetdb5/extras/jaql/jaqltests/Tests/join.stable.out
monetdb5/extras/jaql/jaqltests/Tests/multiline.jaql
monetdb5/extras/jaql/jaqltests/Tests/multiline.stable.err
monetdb5/extras/jaql/jaqltests/Tests/multiline.stable.out
monetdb5/extras/jaql/jaqltests/Tests/shred.jaql.in
monetdb5/extras/jaql/jaqltests/Tests/shred.stable.err
monetdb5/extras/jaql/jaqltests/Tests/shred.stable.out
monetdb5/extras/jaql/jaqltests/Tests/sort.jaql
monetdb5/extras/jaql/jaqltests/Tests/sort.stable.err
monetdb5/extras/jaql/jaqltests/Tests/sort.stable.out
monetdb5/extras/jaql/jaqltests/Tests/top.jaql
monetdb5/extras/jaql/jaqltests/Tests/top.stable.err
monetdb5/extras/jaql/jaqltests/Tests/top.stable.out
monetdb5/extras/jaql/jaqltests/Tests/transform.jaql
monetdb5/extras/jaql/jaqltests/Tests/transform.stable.err
monetdb5/extras/jaql/jaqltests/Tests/transform.stable.out
monetdb5/extras/jaql/jaqltests/Tests/unroll.jaql
monetdb5/extras/jaql/jaqltests/Tests/unroll.stable.err
monetdb5/extras/jaql/jaqltests/Tests/unroll.stable.out
monetdb5/extras/jaql/jaqltree.h
monetdb5/extras/jaql/json_jaql.c
monetdb5/extras/jaql/json_jaql.h
monetdb5/extras/jaql/json_jaql.mal
monetdb5/extras/jaql/parser/Makefile.ag
monetdb5/extras/jaql/parser/jaql.l
monetdb5/extras/jaql/parser/jaql.y
Modified Files:
MonetDB.spec
NT/installer32/MonetDB-ODBC-Installer.vdproj
NT/installer32/MonetDB5-SQL-Installer.vdproj
NT/installer64/MonetDB-ODBC-Installer.vdproj
NT/installer64/MonetDB5-SQL-Installer.vdproj
buildtools/ChangeLog
clients/R/MonetDB.R/DESCRIPTION
clients/R/MonetDB.R/NAMESPACE
clients/R/MonetDB.R/NEWS
clients/R/MonetDB.R/R/control.R
clients/R/MonetDB.R/R/monetdb.R
clients/R/MonetDB.R/man/mc.Rd
clients/R/MonetDB.R/src/mapi.c
clients/R/db.tests/monetdb.test.R
clients/R/db.tests/monetframe.test.R
clients/R/db.tests/sqlsurvey.test.R
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures_gsl.stable.out
clients/Tests/MAL-signatures_nocfitsio.stable.out
clients/Tests/MAL-signatures_sphinxclient.stable.out
clients/Tests/SQL-dump.stable.out
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/examples/C/smack01.c
clients/mapiclient/dump.c
clients/mapiclient/mclient.c
clients/mapiclient/tomograph.c
clients/odbc/driver/SQLDriverConnect.c
clients/python2/monetdb/sql/pythonize.py
clients/python3/monetdb/sql/pythonize.py
common/stream/stream.c
common/utils/msabaoth.c
common/utils/mutils.c
configure.ag
debian/control
debian/monetdb5-server.install
gdk/gdk.h
gdk/gdk_atoms.c
gdk/gdk_bbp.c
gdk/gdk_calc.c
gdk/gdk_heap.c
gdk/gdk_imprints.c
gdk/gdk_posix.c
gdk/gdk_search.c
gdk/gdk_storage.c
gdk/gdk_utils.c
java/src/nl/cwi/monetdb/jdbc/MonetPreparedStatement.java
monetdb5/extras/Makefile.ag
monetdb5/extras/sphinx/sphinx.c
monetdb5/mal/Tests/tst013.stable.out
monetdb5/mal/Tests/tst036.stable.out
monetdb5/mal/Tests/tst050.stable.out
monetdb5/mal/Tests/tst070.stable.out
monetdb5/mal/Tests/tst105.stable.out
monetdb5/mal/Tests/tst106.stable.out
monetdb5/mal/Tests/tst150.stable.out
monetdb5/mal/Tests/tst2504.mal
monetdb5/mal/Tests/tst2504.stable.out
monetdb5/mal/Tests/tst611.stable.out
monetdb5/mal/mal_atom.c
monetdb5/mal/mal_builder.c
monetdb5/mal/mal_client.h
monetdb5/mal/mal_factory.c
monetdb5/mal/mal_import.c
monetdb5/mal/mal_instruction.c
monetdb5/mal/mal_interpreter.c
monetdb5/mal/mal_linker.c
monetdb5/mal/mal_module.c
monetdb5/mal/mal_namespace.c
monetdb5/mal/mal_parser.c
monetdb5/mal/mal_profiler.c
monetdb5/mal/mal_readline.c
monetdb5/mal/mal_resolve.c
monetdb5/mal/mal_runtime.c
monetdb5/mal/mal_session.c
monetdb5/modules/atoms/inet.c
monetdb5/modules/atoms/json.c
monetdb5/modules/atoms/json.h
monetdb5/modules/atoms/json.mal
monetdb5/modules/atoms/str.c
monetdb5/modules/atoms/str.h
monetdb5/modules/kernel/bat5.c
monetdb5/modules/kernel/batstr.c
monetdb5/modules/mal/Tests/All
monetdb5/modules/mal/Tests/pqueue.stable.out
monetdb5/modules/mal/Tests/pqueue2.mal
monetdb5/modules/mal/bbp.c
monetdb5/modules/mal/groupby.c
monetdb5/modules/mal/manifold.c
monetdb5/modules/mal/pqueue.c
monetdb5/modules/mal/pqueue.h
monetdb5/modules/mal/pqueue.mal
monetdb5/modules/mal/sample.mal
monetdb5/optimizer/Tests/inline08.stable.out
monetdb5/optimizer/opt_accumulators.c
monetdb5/optimizer/opt_aliases.c
monetdb5/optimizer/opt_centipede.c
monetdb5/optimizer/opt_dataflow.c
monetdb5/optimizer/opt_macro.c
monetdb5/optimizer/opt_mapreduce.c
monetdb5/optimizer/opt_mergetable.c
monetdb5/optimizer/opt_octopus.c
monetdb5/optimizer/opt_pushselect.c
monetdb5/optimizer/opt_support.c
monetdb5/scheduler/run_octopus.c
monetdb5/scheduler/srvpool.c
monetdb5/tests/BugDay_2005-10-06_4.9.3/Tests/ADT_not_available.SF-850137.stable.out
monetdb5/tests/BugReports/Tests/lngssaretruncated.stable.out
monetdb5/tests/BugTracker/Tests/parser.SF-2051309.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_gencode.c
sql/backends/monet5/sql_scenario.c
sql/backends/monet5/sql_statement.c
sql/backends/monet5/sql_statement.h
sql/benchmarks/ssbm/Tests/02-explain.stable.out
sql/benchmarks/ssbm/Tests/02-plan.stable.out
sql/benchmarks/ssbm/Tests/03-explain.stable.out
sql/benchmarks/ssbm/Tests/03-plan.stable.out
sql/benchmarks/ssbm/Tests/07-explain.stable.out
sql/benchmarks/ssbm/Tests/07-plan.stable.out
sql/benchmarks/ssbm/Tests/08-explain.stable.out
sql/benchmarks/ssbm/Tests/08-plan.stable.out
sql/benchmarks/tpch/Tests/01-explain.stable.out
sql/benchmarks/tpch/Tests/01-plan.stable.out
sql/benchmarks/tpch/Tests/02-explain.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/10-explain.stable.out
sql/benchmarks/tpch/Tests/18-explain.stable.out
sql/benchmarks/tpch/Tests/21-explain.stable.out
sql/common/sql_string.c
sql/common/sql_types.c
sql/scripts/40_json.sql
sql/server/rel_distribute.c
sql/server/rel_dump.c
sql/server/rel_optimizer.c
sql/server/rel_psm.c
sql/server/rel_schema.c
sql/server/rel_updates.c
sql/server/sql_mvc.c
sql/storage/bat/bat_storage.c
sql/storage/restrict/restrict_storage.c
sql/storage/sql_storage.h
sql/storage/store.c
sql/test/ADT2006/bram.sql
sql/test/BugTracker-2009/Tests/old_views_incorrectly_reused.SF-2863804.stable.out
sql/test/BugTracker-2010/Tests/LIMIT_OFFSET_big-endian.Bug-2622.stable.out
sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out
sql/test/BugTracker-2012/Tests/table_function_with_column_subselects.Bug-3172.stable.err
sql/test/BugTracker-2013/Tests/qualified_aggrname.Bug-3332.stable.out
sql/test/BugTracker-2014/Tests/All
sql/test/BugTracker-2014/Tests/crash_on_or_with_in.Bug-3461.stable.out
sql/test/BugTracker-2014/Tests/in_incorrect_multi.Bug-3462.stable.out
sql/test/Tests/orderby_non_selection_column.stable.out
sql/test/Tests/systemfunctions.stable.out
sql/test/Users/Tests/schema.stable.err
sql/test/json/Tests/parsing.stable.err
sql/test/leaks/Tests/check1.stable.out
sql/test/leaks/Tests/check1_gsl.stable.out
sql/test/leaks/Tests/check1_nogeom.stable.out
sql/test/leaks/Tests/check2.stable.out
sql/test/leaks/Tests/check2_gsl.stable.out
sql/test/leaks/Tests/check2_nogeom.stable.out
sql/test/leaks/Tests/check3.stable.out
sql/test/leaks/Tests/check3_gsl.stable.out
sql/test/leaks/Tests/check3_nogeom.stable.out
sql/test/leaks/Tests/check4.stable.out
sql/test/leaks/Tests/check4_gsl.stable.out
sql/test/leaks/Tests/check4_nogeom.stable.out
sql/test/leaks/Tests/check5.stable.out
sql/test/leaks/Tests/check5_gsl.stable.out
sql/test/leaks/Tests/check5_nogeom.stable.out
testing/process.py
tools/merovingian/daemon/argvcmds.c
tools/merovingian/daemon/controlrunner.c
tools/merovingian/daemon/discoveryrunner.c
tools/merovingian/daemon/merovingian.c
tools/merovingian/daemon/multiplex-funnel.c
tools/merovingian/daemon/peering.c
tools/mserver/mserver5.c
Branch: bamloader
Log Message:
Merge with default branch.
diffs (truncated from 57436 to 300 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -479,29 +479,6 @@ version of Sequence Alignment/Map) data.
%{_libdir}/monetdb5/lib_bam.so
%endif
-%package jaql
-Summary: MonetDB5 JAQL
-Group: Applications/Databases
-Requires: MonetDB5-server = %{version}-%{release}
-
-%description jaql
-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 JAQL extension for MonetDB. JAQL is a
-query language for JavaScript Object Notation (JSON).
-
-%files jaql
-%defattr(-,root,root)
-%{_libdir}/monetdb5/autoload/*_jaql.mal
-%{_libdir}/monetdb5/jaql*.mal
-%{_libdir}/monetdb5/json.mal
-%{_libdir}/monetdb5/json_util.mal
-%{_libdir}/monetdb5/lib_jaql.so
-%{_libdir}/monetdb5/lib_json_jaql.so
-
%package -n MonetDB5-server
Summary: MonetDB - Monet Database Management System
Group: Applications/Databases
@@ -553,9 +530,6 @@ fi
%exclude %{_libdir}/monetdb5/gsl.mal
# %exclude %{_libdir}/monetdb5/rdf.mal
%exclude %{_libdir}/monetdb5/sql.mal
-%exclude %{_libdir}/monetdb5/jaql*.mal
-%exclude %{_libdir}/monetdb5/json.mal
-%exclude %{_libdir}/monetdb5/json_util.mal
%{_libdir}/monetdb5/*.mal
# %{_libdir}/monetdb5/autoload/*_fits.mal
%{_libdir}/monetdb5/autoload/*_lsst.mal
@@ -573,8 +547,6 @@ fi
%endif
# %exclude %{_libdir}/monetdb5/lib_rdf.so
%exclude %{_libdir}/monetdb5/lib_sql.so
-%exclude %{_libdir}/monetdb5/lib_jaql.so
-%exclude %{_libdir}/monetdb5/lib_json_jaql.so
%{_libdir}/monetdb5/*.so
%doc %{_mandir}/man1/mserver5.1.gz
@@ -801,7 +773,6 @@ developer, but if you do want to test, t
--enable-geom=%{?with_geos:yes}%{!?with_geos:no} \
--enable-gsl=yes \
--enable-instrument=no \
- --enable-jaql=yes \
--enable-jdbc=no \
--enable-merocontrol=no \
--enable-monetdb5=yes \
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
@@ -330,7 +330,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_779449EF5BAD4B068A50802402E52278"
{
- "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.1b.win32-vs10\\bin\\libeay32.dll"
+ "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.1g.win32-vs10\\bin\\libeay32.dll"
"TargetName" = "8:libeay32.dll"
"Tag" = "8:"
"Folder" = "8:_376EC0506E4F452CA2C78ACE11515435"
@@ -370,7 +370,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_B1B1C0011D7945F892A77F529772EA72"
{
- "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.1b.win32-vs10\\bin\\ssleay32.dll"
+ "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.1g.win32-vs10\\bin\\ssleay32.dll"
"TargetName" = "8:ssleay32.dll"
"Tag" = "8:"
"Folder" = "8:_376EC0506E4F452CA2C78ACE11515435"
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
@@ -153,18 +153,6 @@
}
"Entry"
{
- "MsmKey" = "8:_1F84594549F24A96A4EF15ED9EC7184F"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_1FE6775741C5492FA9A67BAF75C9F430"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_1FE7B02CBBA5493DA5E90CC441A198FC"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -669,12 +657,6 @@
}
"Entry"
{
- "MsmKey" = "8:_A5CCC27A6B2340FBB90FEB21070FCA24"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_A7F05B4CF16E4015B830AAD23130BCCC"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -747,12 +729,6 @@
}
"Entry"
{
- "MsmKey" = "8:_BA07EF9B9C544A88A8581D25BBDC6675"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_BE303DEAED0D4E118580EE3384FBE335"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -855,12 +831,6 @@
}
"Entry"
{
- "MsmKey" = "8:_D97860156B224184BAB2241D9EBA94D1"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_D986512B4FEA496091D4629A748B641D"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -909,12 +879,6 @@
}
"Entry"
{
- "MsmKey" = "8:_E3D3A6E532B2461D9F86BB1492BC66C6"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_E6785DD8A5FF4C3EB096C7A547EB3EFC"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -1533,46 +1497,6 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
-
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_1F84594549F24A96A4EF15ED9EC7184F"
- {
- "SourcePath" = "8:lib\\monetdb5\\lib_json_jaql.dll"
- "TargetName" = "8:lib_json_jaql.dll"
- "Tag" = "8:"
- "Folder" = "8:_B593DAA0787744D6A44D17884E0C3951"
- "Condition" = "8:"
- "Transitive" = "11:FALSE"
- "Vital" = "11:TRUE"
- "ReadOnly" = "11:FALSE"
- "Hidden" = "11:FALSE"
- "System" = "11:FALSE"
- "Permanent" = "11:FALSE"
- "SharedLegacy" = "11:FALSE"
- "PackageAs" = "3:1"
- "Register" = "3:1"
- "Exclude" = "11:FALSE"
- "IsDependency" = "11:FALSE"
- "IsolateTo" = "8:"
- }
-
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_1FE6775741C5492FA9A67BAF75C9F430"
- {
- "SourcePath" = "8:lib\\monetdb5\\json_jaql.mal"
- "TargetName" = "8:json_jaql.mal"
- "Tag" = "8:"
- "Folder" = "8:_B593DAA0787744D6A44D17884E0C3951"
- "Condition" = "8:"
- "Transitive" = "11:FALSE"
- "Vital" = "11:TRUE"
- "ReadOnly" = "11:FALSE"
- "Hidden" = "11:FALSE"
- "System" = "11:FALSE"
- "Permanent" = "11:FALSE"
- "SharedLegacy" = "11:FALSE"
- "PackageAs" = "3:1"
- "Register" = "3:1"
- "Exclude" = "11:FALSE"
- "IsDependency" = "11:FALSE"
- "IsolateTo" = "8:"
- }
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_1FE7B02CBBA5493DA5E90CC441A198FC"
{
"SourcePath" = "8:banner.bmp"
@@ -1835,7 +1759,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_2E0FEE7726DA47369758C263666F3DB1"
{
- "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.1b.win32-vs10\\lib\\libeay32.lib"
+ "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.1g.win32-vs10\\lib\\libeay32.lib"
"TargetName" = "8:libeay32.lib"
"Tag" = "8:"
"Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
@@ -2095,7 +2019,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_45C820B6483D494EBFE6F9A28A30760C"
{
- "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.1b.win32-vs10\\bin\\ssleay32.dll"
+ "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.1g.win32-vs10\\bin\\ssleay32.dll"
"TargetName" = "8:ssleay32.dll"
"Tag" = "8:"
"Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
@@ -2455,7 +2379,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_732094CE07974147A084EDD6A5F43C6F"
{
- "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.1b.win32-vs10\\lib\\ssleay32.lib"
+ "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.1g.win32-vs10\\lib\\ssleay32.lib"
"TargetName" = "8:ssleay32.lib"
"Tag" = "8:"
"Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
@@ -3233,26 +3157,6 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
-
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A5CCC27A6B2340FBB90FEB21070FCA24"
- {
- "SourcePath" = "8:lib\\monetdb5\\autoload\\30_jaql.mal"
- "TargetName" = "8:30_jaql.mal"
- "Tag" = "8:"
- "Folder" = "8:_A4A821D237B943CFACE8D54F3F3971E3"
- "Condition" = "8:"
- "Transitive" = "11:FALSE"
- "Vital" = "11:TRUE"
- "ReadOnly" = "11:FALSE"
- "Hidden" = "11:FALSE"
- "System" = "11:FALSE"
- "Permanent" = "11:FALSE"
- "SharedLegacy" = "11:FALSE"
- "PackageAs" = "3:1"
- "Register" = "3:1"
- "Exclude" = "11:FALSE"
- "IsDependency" = "11:FALSE"
- "IsolateTo" = "8:"
- }
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A7F05B4CF16E4015B830AAD23130BCCC"
{
"SourcePath" = "8:stethoscope.bat"
@@ -3493,26 +3397,6 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
-
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_BA07EF9B9C544A88A8581D25BBDC6675"
- {
- "SourcePath" = "8:lib\\monetdb5\\lib_jaql.dll"
- "TargetName" = "8:lib_jaql.dll"
- "Tag" = "8:"
- "Folder" = "8:_B593DAA0787744D6A44D17884E0C3951"
- "Condition" = "8:"
- "Transitive" = "11:FALSE"
- "Vital" = "11:TRUE"
- "ReadOnly" = "11:FALSE"
- "Hidden" = "11:FALSE"
- "System" = "11:FALSE"
- "Permanent" = "11:FALSE"
- "SharedLegacy" = "11:FALSE"
- "PackageAs" = "3:1"
- "Register" = "3:1"
- "Exclude" = "11:FALSE"
- "IsDependency" = "11:FALSE"
- "IsolateTo" = "8:"
- }
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_BE303DEAED0D4E118580EE3384FBE335"
{
"SourcePath" = "8:lib\\monetdb5\\sql_decimal.mal"
@@ -3853,26 +3737,6 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
-
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_D97860156B224184BAB2241D9EBA94D1"
- {
- "SourcePath" = "8:lib\\monetdb5\\jaql.mal"
- "TargetName" = "8:jaql.mal"
- "Tag" = "8:"
- "Folder" = "8:_B593DAA0787744D6A44D17884E0C3951"
- "Condition" = "8:"
- "Transitive" = "11:FALSE"
- "Vital" = "11:TRUE"
- "ReadOnly" = "11:FALSE"
- "Hidden" = "11:FALSE"
- "System" = "11:FALSE"
- "Permanent" = "11:FALSE"
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
