Changeset: cbea052009f1 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=cbea052009f1
Added Files:
sql/test/BugTracker-2014/Tests/incorrect_floating_point_cast.Bug-3633.sql
sql/test/BugTracker-2014/Tests/incorrect_floating_point_cast.Bug-3633.stable.err
sql/test/BugTracker-2014/Tests/incorrect_floating_point_cast.Bug-3633.stable.out
sql/test/BugTracker-2014/Tests/inet_error_handling.Bug-3624.sql
sql/test/BugTracker-2014/Tests/inet_error_handling.Bug-3624.stable.err
sql/test/BugTracker-2014/Tests/inet_error_handling.Bug-3624.stable.out
sql/test/BugTracker-2014/Tests/missing_alias.Bug-3626.sql
sql/test/BugTracker-2014/Tests/missing_alias.Bug-3626.stable.err
sql/test/BugTracker-2014/Tests/missing_alias.Bug-3626.stable.out
sql/test/BugTracker-2014/Tests/too_general_errmsg.Bug-3605.sql
sql/test/BugTracker-2014/Tests/too_general_errmsg.Bug-3605.stable.err
sql/test/BugTracker-2014/Tests/too_general_errmsg.Bug-3605.stable.out
sql/test/BugTracker-2014/Tests/type_resolution.Bug-3622.sql
sql/test/BugTracker-2014/Tests/type_resolution.Bug-3622.stable.err
sql/test/BugTracker-2014/Tests/type_resolution.Bug-3622.stable.out
sql/test/BugTracker-2014/Tests/typecast_error.Bug-3622.stable.err
sql/test/BugTracker-2014/Tests/typecast_error.Bug-3622.stable.out
Modified Files:
NT/installer32/MonetDB5-Geom-Module.vdproj
NT/installer32/MonetDB5-SQL-Installer.vdproj
NT/installer64/MonetDB5-Geom-Module.vdproj
NT/installer64/MonetDB5-SQL-Installer.vdproj
NT/monetdb_config.h.in
buildtools/conf/rules.mk
buildtools/doc/windowsbuild.rst
clients/Tests/MAL-signatures_all.stable.out
clients/Tests/MAL-signatures_all.stable.out.int128
clients/Tests/MAL-signatures_fits_geom.stable.out
clients/Tests/MAL-signatures_fits_geom.stable.out.int128
clients/Tests/MAL-signatures_geom.stable.out
clients/Tests/MAL-signatures_geom.stable.out.int128
clients/Tests/MAL-signatures_none.stable.out
clients/Tests/MAL-signatures_none.stable.out.int128
clients/Tests/SQL-dump_all.stable.out
clients/Tests/SQL-dump_all.stable.out.int128
clients/Tests/SQL-dump_all.stable.out.oid32
clients/Tests/SQL-dump_all.stable.out.oid32.int128
clients/Tests/SQL-dump_geom.stable.out
clients/Tests/SQL-dump_geom.stable.out.32bit
clients/Tests/SQL-dump_geom.stable.out.64bit.oid32
clients/Tests/SQL-dump_geom.stable.out.int128
clients/Tests/SQL-dump_geom.stable.out.oid32.int128
clients/Tests/SQL-dump_none.stable.out
clients/Tests/SQL-dump_none.stable.out.int128
clients/Tests/exports.stable.out
clients/odbc/driver/ODBC.syms
clients/odbc/driver/SQLGetConnectAttr.c
clients/odbc/driver/SQLGetConnectOption.c
clients/odbc/driver/SQLSetConnectOption.c
common/stream/stream.c
common/stream/stream.h
common/utils/mutils.c
configure.ag
gdk/gdk_atoms.c
gdk/gdk_select.c
monetdb5/mal/Tests/tst059.mal
monetdb5/mal/mal_profiler.c
monetdb5/modules/atoms/Tests/inet01.mal
monetdb5/modules/atoms/Tests/inet01.stable.out
monetdb5/modules/atoms/inet.c
monetdb5/modules/atoms/mtime.c
monetdb5/modules/kernel/mmath.c
monetdb5/modules/kernel/mmath.h
monetdb5/optimizer/opt_dataflow.c
monetdb5/optimizer/opt_generator.c
monetdb5/optimizer/opt_mitosis.c
monetdb5/optimizer/opt_pushselect.c
monetdb5/optimizer/opt_querylog.c
monetdb5/optimizer/opt_wrapper.c
sql/backends/monet5/generator/Tests/generator03.stable.out
sql/backends/monet5/generator/generator.c
sql/backends/monet5/gsl/Tests/gsl01.sql
sql/backends/monet5/gsl/Tests/gsl01.stable.err
sql/benchmarks/nobench/Tests/nobench.stable.out
sql/benchmarks/tpch/Tests/11-explain.stable.out
sql/benchmarks/tpch/Tests/11-explain.stable.out.int128
sql/benchmarks/tpch/Tests/11-plan.stable.out
sql/benchmarks/tpch/Tests/11-plan.stable.out.int128
sql/benchmarks/tpch/Tests/17-explain.stable.out
sql/benchmarks/tpch/Tests/17-explain.stable.out.int128
sql/benchmarks/tpch/Tests/17-plan.stable.out
sql/benchmarks/tpch/Tests/17-plan.stable.out.int128
sql/benchmarks/tpch/Tests/20-explain.stable.out
sql/benchmarks/tpch/Tests/20-explain.stable.out.int128
sql/benchmarks/tpch/Tests/20-plan.stable.out
sql/benchmarks/tpch/Tests/20-plan.stable.out.int128
sql/benchmarks/tpch/Tests/22-explain.stable.out
sql/benchmarks/tpch/Tests/22-explain.stable.out.int128
sql/benchmarks/tpch/Tests/22-plan.stable.out
sql/server/rel_select.c
sql/server/sql_semantic.c
sql/test/ADT2006/Tests/bram.stable.out
sql/test/BugDay_2005-10-06_2.8/Tests/mixed_type.SF-917372.stable.err
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/multiple_select_cast.SF-938419.stable.out
sql/test/BugDay_2005-12-19_2.9.3/Tests/NULL_in_CASE.SF-1211335.stable.out
sql/test/BugDay_2005-12-19_2.9.3/Tests/cast_bigint_to_int.SF-1211903.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/timestamp_fraction.SF-1357342.stable.out
sql/test/BugTracker-2008/Tests/decimal_cast_in_view.SF-2075223.stable.out
sql/test/BugTracker-2010/Tests/join_problem.Bug-2694.stable.out
sql/test/BugTracker-2011/Tests/Multiplication_and_cast.Bug-2923.stable.out
sql/test/BugTracker-2012/Tests/cast_varchar_to_double.Bug-3071.stable.out
sql/test/BugTracker-2012/Tests/date_script_test.Bug-2973.stable.err.Windows
sql/test/BugTracker-2012/Tests/date_script_test.Bug-2973.stable.out.Windows
sql/test/BugTracker-2012/Tests/incorrect_cast_from_double_to_int.Bug-2579.stable.err
sql/test/BugTracker-2012/Tests/incorrect_cast_from_double_to_int.Bug-2579.stable.out
sql/test/BugTracker-2012/Tests/interval_timestamp.Bug-3002.stable.err
sql/test/BugTracker-2013/Tests/bogus_aggregation_casts.Bug-3342.stable.out
sql/test/BugTracker-2013/Tests/decimal-cast.Bug-3310.stable.out
sql/test/BugTracker-2013/Tests/qualified_aggrname.Bug-3332.stable.out
sql/test/BugTracker-2013/Tests/qualified_aggrname.Bug-3332.stable.out.int128
sql/test/BugTracker-2014/Tests/All
sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.stable.out
sql/test/BugTracker-2014/Tests/typecast_error.Bug-3622.sql
sql/test/BugTracker/Tests/case_in_aggr_bug.SF-1506545.stable.out
sql/test/BugTracker/Tests/cast_interval2time.SF-1488247.stable.out
sql/test/BugTracker/Tests/convert_dec2varchar.SF-1774312.stable.out
sql/test/BugTracker/Tests/crash_on_cast.SF-1357271.stable.out
sql/test/Dependencies/Tests/Dependencies_bam.stable.out.int128
sql/test/Tests/coalesce.stable.err
sql/test/Tests/coalesce.stable.out
sql/test/VOC/Tests/VOC.stable.out
sql/test/bugs/Tests/aggr_single_value.stable.out
sql/test/bugs/Tests/aggr_single_value.stable.out.int128
sql/test/bugs/Tests/case_substring.stable.out
sql/test/bugs/Tests/cast_bool2int-bug-sf-1000576.stable.out
sql/test/bugs/Tests/cast_bool2int-bug-sf-951800.stable.out
sql/test/bugs/Tests/cast_varchar2int-bug-sf-964165.stable.out
sql/test/bugs/Tests/float2dec.stable.out
sql/test/bugs/Tests/float_arith_cast2int-bug-sf-949255.stable.out
sql/test/bugs/Tests/interval_convert_bugs-sf-1274077-1274085.stable.out
sql/test/bugs/Tests/timestamp_comparison-bug-sf-1158581.stable.out
sql/test/json/Tests/coercions.stable.out
sql/test/leaks/Tests/check0.stable.out
sql/test/leaks/Tests/check0.stable.out.int128
sql/test/leaks/Tests/check0_bam.stable.out
sql/test/leaks/Tests/check0_bam.stable.out.int128
sql/test/leaks/Tests/check0_gsl.stable.out.int128
sql/test/leaks/Tests/check0_nogeom.stable.out
sql/test/leaks/Tests/check0_nogeom.stable.out.int128
sql/test/leaks/Tests/check1.stable.out
sql/test/leaks/Tests/check1.stable.out.int128
sql/test/leaks/Tests/check1_bam.stable.out
sql/test/leaks/Tests/check1_bam.stable.out.int128
sql/test/leaks/Tests/check1_gsl.stable.out.int128
sql/test/leaks/Tests/check1_nogeom.stable.out
sql/test/leaks/Tests/check1_nogeom.stable.out.int128
sql/test/leaks/Tests/check2.stable.out
sql/test/leaks/Tests/check2.stable.out.int128
sql/test/leaks/Tests/check2_bam.stable.out
sql/test/leaks/Tests/check2_bam.stable.out.int128
sql/test/leaks/Tests/check2_gsl.stable.out.int128
sql/test/leaks/Tests/check2_nogeom.stable.out
sql/test/leaks/Tests/check2_nogeom.stable.out.int128
sql/test/leaks/Tests/check3.stable.out
sql/test/leaks/Tests/check3.stable.out.int128
sql/test/leaks/Tests/check3_bam.stable.out
sql/test/leaks/Tests/check3_bam.stable.out.int128
sql/test/leaks/Tests/check3_gsl.stable.out.int128
sql/test/leaks/Tests/check3_nogeom.stable.out
sql/test/leaks/Tests/check3_nogeom.stable.out.int128
sql/test/leaks/Tests/check4.stable.out
sql/test/leaks/Tests/check4.stable.out.int128
sql/test/leaks/Tests/check4_bam.stable.out
sql/test/leaks/Tests/check4_bam.stable.out.int128
sql/test/leaks/Tests/check4_gsl.stable.out.int128
sql/test/leaks/Tests/check4_nogeom.stable.out
sql/test/leaks/Tests/check4_nogeom.stable.out.int128
sql/test/leaks/Tests/check5.stable.out
sql/test/leaks/Tests/check5.stable.out.int128
sql/test/leaks/Tests/check5_bam.stable.out
sql/test/leaks/Tests/check5_bam.stable.out.int128
sql/test/leaks/Tests/check5_gsl.stable.out.int128
sql/test/leaks/Tests/check5_nogeom.stable.out
sql/test/leaks/Tests/check5_nogeom.stable.out.int128
sql/test/leaks/Tests/drop3.stable.out
sql/test/leaks/Tests/drop3.stable.out.int128
sql/test/leaks/Tests/drop3_bam.stable.out
sql/test/leaks/Tests/drop3_bam.stable.out.int128
sql/test/leaks/Tests/drop3_gsl.stable.out.int128
sql/test/leaks/Tests/drop3_nogeom.stable.out
sql/test/leaks/Tests/drop3_nogeom.stable.out.int128
sql/test/leaks/Tests/select1.stable.out
sql/test/leaks/Tests/select1.stable.out.int128
sql/test/leaks/Tests/select1_bam.stable.out
sql/test/leaks/Tests/select1_bam.stable.out.int128
sql/test/leaks/Tests/select1_gsl.stable.out.int128
sql/test/leaks/Tests/select1_nogeom.stable.out
sql/test/leaks/Tests/select1_nogeom.stable.out.int128
sql/test/leaks/Tests/select2.stable.out
sql/test/leaks/Tests/select2.stable.out.int128
sql/test/leaks/Tests/select2_bam.stable.out
sql/test/leaks/Tests/select2_bam.stable.out.int128
sql/test/leaks/Tests/select2_gsl.stable.out.int128
sql/test/leaks/Tests/select2_nogeom.stable.out
sql/test/leaks/Tests/select2_nogeom.stable.out.int128
sql/test/leaks/Tests/temp1.stable.out
sql/test/leaks/Tests/temp1.stable.out.int128
sql/test/leaks/Tests/temp1_bam.stable.out
sql/test/leaks/Tests/temp1_bam.stable.out.int128
sql/test/leaks/Tests/temp1_gsl.stable.out.int128
sql/test/leaks/Tests/temp1_nogeom.stable.out
sql/test/leaks/Tests/temp1_nogeom.stable.out.int128
sql/test/leaks/Tests/temp2.stable.out
sql/test/leaks/Tests/temp2.stable.out.int128
sql/test/leaks/Tests/temp2_bam.stable.out
sql/test/leaks/Tests/temp2_bam.stable.out.int128
sql/test/leaks/Tests/temp2_gsl.stable.out.int128
sql/test/leaks/Tests/temp2_nogeom.stable.out
sql/test/leaks/Tests/temp2_nogeom.stable.out.int128
sql/test/leaks/Tests/temp3.stable.out
sql/test/leaks/Tests/temp3.stable.out.int128
sql/test/leaks/Tests/temp3_bam.stable.out
sql/test/leaks/Tests/temp3_bam.stable.out.int128
sql/test/leaks/Tests/temp3_gsl.stable.out.int128
sql/test/leaks/Tests/temp3_nogeom.stable.out
sql/test/leaks/Tests/temp3_nogeom.stable.out.int128
sql/test/pg_regress/Tests/alter_table.stable.err
sql/test/pg_regress/Tests/arrays.stable.err
sql/test/pg_regress/Tests/boolean.stable.err
sql/test/pg_regress/Tests/boolean.stable.out
sql/test/pg_regress/Tests/case.stable.err
sql/test/pg_regress/Tests/char.stable.err
sql/test/pg_regress/Tests/char.stable.out
sql/test/pg_regress/Tests/comments.stable.err
sql/test/pg_regress/Tests/create_aggregate.stable.err
sql/test/pg_regress/Tests/create_misc.stable.err
sql/test/pg_regress/Tests/create_operator.stable.err
sql/test/pg_regress/Tests/date.stable.err
sql/test/pg_regress/Tests/date.stable.out
sql/test/pg_regress/Tests/drop.stable.err
sql/test/pg_regress/Tests/float4.stable.err
sql/test/pg_regress/Tests/float4.stable.out
sql/test/pg_regress/Tests/float8.stable.err
sql/test/pg_regress/Tests/float8.stable.out
sql/test/pg_regress/Tests/inet.stable.err
sql/test/pg_regress/Tests/inet.stable.out
sql/test/pg_regress/Tests/insert.stable.err
sql/test/pg_regress/Tests/int2.stable.err
sql/test/pg_regress/Tests/int2.stable.out
sql/test/pg_regress/Tests/int4.stable.err
sql/test/pg_regress/Tests/int4.stable.out
sql/test/pg_regress/Tests/int8.stable.err
sql/test/pg_regress/Tests/int8.stable.out
sql/test/pg_regress/Tests/interval.stable.err
sql/test/pg_regress/Tests/interval.stable.out
sql/test/pg_regress/Tests/limit.stable.err
sql/test/pg_regress/Tests/load.SQL.sh
sql/test/pg_regress/Tests/numeric.stable.err
sql/test/pg_regress/Tests/numeric.stable.out
sql/test/pg_regress/Tests/numeric_big.stable.err
sql/test/pg_regress/Tests/numerology.stable.err
sql/test/pg_regress/Tests/oid.stable.err
sql/test/pg_regress/Tests/reltime.stable.out
sql/test/pg_regress/Tests/select_into.stable.err
sql/test/pg_regress/Tests/strings.stable.err
sql/test/pg_regress/Tests/strings.stable.out
sql/test/pg_regress/Tests/strings_cast.stable.err
sql/test/pg_regress/Tests/strings_cast.stable.out
sql/test/pg_regress/Tests/strings_concat.stable.err
sql/test/pg_regress/Tests/text.stable.out
sql/test/pg_regress/Tests/timestamp.stable.err
sql/test/pg_regress/Tests/timestamp.stable.out
sql/test/pg_regress/Tests/timestamptz.stable.err
sql/test/pg_regress/Tests/timestamptz.stable.out
sql/test/pg_regress/Tests/varchar.stable.err
sql/test/pg_regress/Tests/without_oid.stable.err
sql/test/snodgrass/Tests/cast_select.stable.out
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
Branch: transaction-replication
Log Message:
Merge with default branch
diffs (truncated from 23325 to 300 lines):
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
@@ -229,7 +229,7 @@
"SourcePath" = "8:C:\\Libraries\\geos-3.4.2.win32\\bin\\geos_c.dll"
"TargetName" = "8:geos_c.dll"
"Tag" = "8:"
- "Folder" = "8:_4D9CE65EDD774551869CFD46B59B4F9E"
+ "Folder" = "8:_272635DA3D924F9CB05C410645076698"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
@@ -331,6 +331,17 @@
"Property" = "8:NEWPROPERTY1"
"Folders"
{
+
"{9EF0B969-E518-4E46-987F-47570745A589}:_272635DA3D924F9CB05C410645076698"
+ {
+ "Name" = "8:bin"
+ "AlwaysCreate" = "11:FALSE"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "Property" = "8:_4D04B65294AD4B5CBCD4EE336AF9B51A"
+ "Folders"
+ {
+ }
+ }
"{9EF0B969-E518-4E46-987F-47570745A589}:_4D9CE65EDD774551869CFD46B59B4F9E"
{
"Name" = "8:lib"
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
@@ -1229,7 +1229,7 @@
"SourcePath" =
"8:C:\\Libraries\\bzip2-1.0.6.win32\\bin\\libbz2.dll"
"TargetName" = "8:libbz2.dll"
"Tag" = "8:"
- "Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
+ "Folder" = "8:_1EC19BD0D849484790DB6A7D69758E24"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
@@ -1329,7 +1329,7 @@
"SourcePath" =
"8:C:\\Libraries\\libxml2-2.9.2.win32\\bin\\libxml2.dll"
"TargetName" = "8:libxml2.dll"
"Tag" = "8:"
- "Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
+ "Folder" = "8:_1EC19BD0D849484790DB6A7D69758E24"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
@@ -1749,7 +1749,7 @@
"SourcePath" =
"8:C:\\Libraries\\iconv-1.11.1.win32\\bin\\iconv.dll"
"TargetName" = "8:iconv.dll"
"Tag" = "8:"
- "Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
+ "Folder" = "8:_1EC19BD0D849484790DB6A7D69758E24"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
@@ -2069,7 +2069,7 @@
"SourcePath" =
"8:C:\\Libraries\\openssl-1.0.1j.win32\\bin\\ssleay32.dll"
"TargetName" = "8:ssleay32.dll"
"Tag" = "8:"
- "Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
+ "Folder" = "8:_1EC19BD0D849484790DB6A7D69758E24"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
@@ -2149,7 +2149,7 @@
"SourcePath" = "8:C:\\Libraries\\pcre-8.36.win32\\bin\\pcre.dll"
"TargetName" = "8:pcre.dll"
"Tag" = "8:"
- "Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
+ "Folder" = "8:_1EC19BD0D849484790DB6A7D69758E24"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
@@ -2749,7 +2749,7 @@
"SourcePath" = "8:C:\\Libraries\\zlib-1.2.8.win32\\bin\\zlib1.dll"
"TargetName" = "8:zlib1.dll"
"Tag" = "8:"
- "Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
+ "Folder" = "8:_1EC19BD0D849484790DB6A7D69758E24"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
@@ -3329,7 +3329,7 @@
"SourcePath" = "8:lib\\libmapi.dll"
"TargetName" = "8:libmapi.dll"
"Tag" = "8:"
- "Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
+ "Folder" = "8:_1EC19BD0D849484790DB6A7D69758E24"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
@@ -3349,7 +3349,7 @@
"SourcePath" = "8:lib\\libbat.dll"
"TargetName" = "8:libbat.dll"
"Tag" = "8:"
- "Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
+ "Folder" = "8:_1EC19BD0D849484790DB6A7D69758E24"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
@@ -3789,7 +3789,7 @@
"SourcePath" = "8:lib\\libmonetdb5.dll"
"TargetName" = "8:libmonetdb5.dll"
"Tag" = "8:"
- "Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
+ "Folder" = "8:_1EC19BD0D849484790DB6A7D69758E24"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
@@ -3869,7 +3869,7 @@
"SourcePath" = "8:lib\\libstream.dll"
"TargetName" = "8:libstream.dll"
"Tag" = "8:"
- "Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
+ "Folder" = "8:_1EC19BD0D849484790DB6A7D69758E24"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
@@ -4009,7 +4009,7 @@
"SourcePath" =
"8:C:\\Libraries\\openssl-1.0.1j.win32\\bin\\libeay32.dll"
"TargetName" = "8:libeay32.dll"
"Tag" = "8:"
- "Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
+ "Folder" = "8:_1EC19BD0D849484790DB6A7D69758E24"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
diff --git a/NT/installer64/MonetDB5-Geom-Module.vdproj
b/NT/installer64/MonetDB5-Geom-Module.vdproj
--- a/NT/installer64/MonetDB5-Geom-Module.vdproj
+++ b/NT/installer64/MonetDB5-Geom-Module.vdproj
@@ -229,7 +229,7 @@
"SourcePath" = "8:C:\\Libraries\\geos-3.4.2.win64\\bin\\geos_c.dll"
"TargetName" = "8:geos_c.dll"
"Tag" = "8:"
- "Folder" = "8:_4D9CE65EDD774551869CFD46B59B4F9E"
+ "Folder" = "8:_5A4CF78A6BC241B6AAEFF30075ECAE13"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
@@ -375,6 +375,17 @@
}
}
}
+
"{9EF0B969-E518-4E46-987F-47570745A589}:_5A4CF78A6BC241B6AAEFF30075ECAE13"
+ {
+ "Name" = "8:bin"
+ "AlwaysCreate" = "11:FALSE"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "Property" = "8:_8243C459978C4243AD7AACC0339F371E"
+ "Folders"
+ {
+ }
+ }
}
}
"{3C67513D-01DD-4637-8A68-80971EB9504F}:_D9A7267FC9784D8BBD3CBC6EC1754DBE"
diff --git a/NT/installer64/MonetDB5-SQL-Installer.vdproj
b/NT/installer64/MonetDB5-SQL-Installer.vdproj
--- a/NT/installer64/MonetDB5-SQL-Installer.vdproj
+++ b/NT/installer64/MonetDB5-SQL-Installer.vdproj
@@ -1209,7 +1209,7 @@
"SourcePath" =
"8:C:\\Libraries\\bzip2-1.0.6.win64\\bin\\libbz2.dll"
"TargetName" = "8:libbz2.dll"
"Tag" = "8:"
- "Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
+ "Folder" = "8:_1EC19BD0D849484790DB6A7D69758E24"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
@@ -1309,7 +1309,7 @@
"SourcePath" =
"8:C:\\Libraries\\libxml2-2.9.2.win64\\bin\\libxml2.dll"
"TargetName" = "8:libxml2.dll"
"Tag" = "8:"
- "Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
+ "Folder" = "8:_1EC19BD0D849484790DB6A7D69758E24"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
@@ -1729,7 +1729,7 @@
"SourcePath" =
"8:C:\\Libraries\\iconv-1.11.1.win64\\bin\\iconv.dll"
"TargetName" = "8:iconv.dll"
"Tag" = "8:"
- "Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
+ "Folder" = "8:_1EC19BD0D849484790DB6A7D69758E24"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
@@ -2069,7 +2069,7 @@
"SourcePath" =
"8:C:\\Libraries\\openssl-1.0.1j.win64\\bin\\ssleay32.dll"
"TargetName" = "8:ssleay32.dll"
"Tag" = "8:"
- "Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
+ "Folder" = "8:_1EC19BD0D849484790DB6A7D69758E24"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
@@ -2149,7 +2149,7 @@
"SourcePath" = "8:C:\\Libraries\\pcre-8.36.win64\\bin\\pcre.dll"
"TargetName" = "8:pcre.dll"
"Tag" = "8:"
- "Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
+ "Folder" = "8:_1EC19BD0D849484790DB6A7D69758E24"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
@@ -2729,7 +2729,7 @@
"SourcePath" = "8:C:\\Libraries\\zlib-1.2.8.win64\\bin\\zlib1.dll"
"TargetName" = "8:zlib1.dll"
"Tag" = "8:"
- "Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
+ "Folder" = "8:_1EC19BD0D849484790DB6A7D69758E24"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
@@ -3309,7 +3309,7 @@
"SourcePath" = "8:lib\\libmapi.dll"
"TargetName" = "8:libmapi.dll"
"Tag" = "8:"
- "Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
+ "Folder" = "8:_1EC19BD0D849484790DB6A7D69758E24"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
@@ -3329,7 +3329,7 @@
"SourcePath" = "8:lib\\libbat.dll"
"TargetName" = "8:libbat.dll"
"Tag" = "8:"
- "Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
+ "Folder" = "8:_1EC19BD0D849484790DB6A7D69758E24"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
@@ -3749,7 +3749,7 @@
"SourcePath" = "8:lib\\libmonetdb5.dll"
"TargetName" = "8:libmonetdb5.dll"
"Tag" = "8:"
- "Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
+ "Folder" = "8:_1EC19BD0D849484790DB6A7D69758E24"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
@@ -3829,7 +3829,7 @@
"SourcePath" = "8:lib\\libstream.dll"
"TargetName" = "8:libstream.dll"
"Tag" = "8:"
- "Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
+ "Folder" = "8:_1EC19BD0D849484790DB6A7D69758E24"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
@@ -3969,7 +3969,7 @@
"SourcePath" =
"8:C:\\Libraries\\openssl-1.0.1j.win64\\bin\\libeay32.dll"
"TargetName" = "8:libeay32.dll"
"Tag" = "8:"
- "Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
+ "Folder" = "8:_1EC19BD0D849484790DB6A7D69758E24"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
diff --git a/NT/monetdb_config.h.in b/NT/monetdb_config.h.in
--- a/NT/monetdb_config.h.in
+++ b/NT/monetdb_config.h.in
@@ -26,6 +26,7 @@
* _MSC_VER = 1400: Visual Studio 8
* _MSC_VER = 1500: Visual Studio 9.0
* _MSC_VER = 1600: Visual Studio 10.0
+ * _MSC_VER = 1800: Visual Studio 12.0
*/
/* Prevent pollution through excessive inclusion of include files by
@@ -145,13 +146,17 @@
/* #undef HAVE_FDATASYNC */
/* Define to 1 if you have the <fenv.h> header file. */
-/* #undef HAVE_FENV_H */
+#if _MSC_VER > 1600
+#define HAVE_FENV_H 1
+#endif
/* Define to 1 if you have the `fpclass' function. */
-#define HAVE_FPCLASS 1
+#define HAVE_FPCLASS 1 /* uses _fpclass, see mmath.c */
/* Define to 1 if you have the `fpclassify' function. */
-/* #undef HAVE_FPCLASSIFY */
+#if _MSC_VER > 1600
+#define HAVE_FPCLASSIFY 1
+#endif
/* Define to 1 if fseeko (and presumably ftello) exists and is declared. */
/* #undef HAVE_FSEEKO */
@@ -226,7 +231,9 @@
#define HAVE_IO_H 1
/* Define to 1 if you have the `isinf' function. */
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
