Changeset: d4d230231209 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d4d230231209
Modified Files:
MonetDB.spec
NT/installer32/MonetDB5-SQL-Installer.vdproj
NT/installer64/MonetDB5-SQL-Installer.vdproj
clients/odbc/driver/ODBCConvert.c
debian/control
debian/fix-deb.sh
debian/monetdb-r.install
debian/monetdb5-sql.install
debian/rules
gdk/gdk_posix.c
gdk/gdk_storage.c
Branch: jit
Log Message:
Merge with default
diffs (truncated from 8234 to 300 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -9,6 +9,7 @@
%define bits 32
%else
%define bits 64
+%define with_int128=1
%endif
# only add .oidXX suffix if oid size differs from bit size
@@ -134,6 +135,7 @@ BuildRequires: liblas >= 1.8.0
%endif
BuildRequires: libatomic_ops-devel
BuildRequires: libcurl-devel
+BuildRequires: xz-devel
# BuildRequires: libmicrohttpd-devel
# BuildRequires: libsphinxclient-devel
BuildRequires: libuuid-devel
@@ -937,31 +939,43 @@ developer, but if you do want to test, t
--enable-console=yes \
--enable-debug=no \
--enable-developer=no \
+ --enable-embedded=no \
+ --enable-embedded-r=no \
--enable-fits=%{?with_fits:yes}%{!?with_fits:no} \
--enable-gdk=yes \
--enable-geom=%{?with_geos:yes}%{!?with_geos:no} \
--enable-gsl=yes \
--enable-instrument=no \
+ --enable-int128=%{?with_int128:yes}%{!?with_int128:no} \
--enable-jdbc=no \
--enable-lidar=%{?with_lidar:yes}%{!?with_lidar:no} \
+ --enable-mapi=yes \
--enable-merocontrol=no \
--enable-microhttpd=no \
--enable-monetdb5=yes \
+ --enable-netcdf=no \
--enable-odbc=yes \
--enable-oid32=%{?oid32:yes}%{!?oid32:no} \
--enable-optimize=yes \
--enable-profile=no \
--enable-rintegration=%{?with_rintegration:yes}%{!?with_rintegration:no} \
+ --enable-shp=no \
--enable-sql=yes \
--enable-strict=no \
--enable-testing=yes \
--with-ant=no \
--with-bz2=yes \
+ --with-curl=yes \
+ --with-gdal=yes \
--with-geos=%{?with_geos:yes}%{!?with_geos:no} \
--with-java=no \
--with-liblas=%{?with_lidar:yes}%{!?with_lidar:no} \
+ --with-libxml2=yes \
+ --with-lzma=yes \
+ --with-openssl=yes \
--with-perl=yes \
--with-perl-libdir=lib/perl5 \
+ --with-proj=no \
--with-pthread=yes \
--with-python2=yes \
--with-python3=%{?rhel:no}%{!?rhel:yes} \
@@ -969,6 +983,7 @@ developer, but if you do want to test, t
--with-samtools=%{?with_samtools:yes}%{!?with_samtools:no} \
--with-sphinxclient=no \
--with-unixodbc=yes \
+ --with-uuid=yes \
--with-valgrind=no \
%{?comp_cc:CC="%{comp_cc}"}
diff --git a/NT/installer32/MonetDB5-SQL-Installer.vdproj
b/NT/installer32/MonetDB5-SQL-Installer.vdproj
--- a/NT/installer32/MonetDB5-SQL-Installer.vdproj
+++ b/NT/installer32/MonetDB5-SQL-Installer.vdproj
@@ -15,7 +15,13 @@
{
"Entry"
{
- "MsmKey" = "8:_00F62C0B0C0A4F558B229C4B12198B98"
+ "MsmKey" = "8:_002C645E1F0A414A895A6AF8201AFF56"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_0048FCA3339548038226397D510E3F33"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
@@ -27,49 +33,37 @@
}
"Entry"
{
- "MsmKey" = "8:_054EE390F0FA416AA82A9394EBE16943"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_05D32586D7A945E1B82C9FA8FEE9D43E"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_060C028BEB564189B5FD76A77E163B13"
+ "MsmKey" = "8:_06685A94193940C88BD2D9312917EBAC"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_0667CBD6AF0A4945898FE1C83785C478"
+ "MsmKey" = "8:_0695CDB7B5264A03B215ABB249790C84"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_081E9101CD11471CBD8D38A6B48A19F3"
+ "MsmKey" = "8:_0772104021E343AC808757620FA95CBC"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_08FE3FD8B70B485EA4405D5FA91E1F1D"
+ "MsmKey" = "8:_09274CA78E354436AEAAFB18754531B4"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_0C3EBFF35EB44A65AD6DA13F68C65091"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_0C663F8F9CD74DE2A56C520C4E893AA2"
+ "MsmKey" = "8:_0A724E69D2204E1DADD8DA62E2F84717"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
@@ -81,13 +75,13 @@
}
"Entry"
{
- "MsmKey" = "8:_0E1E72C6494247338F2CA9D11217EAEA"
+ "MsmKey" = "8:_0FC330457B7F46ACADF150AB7ABB4B92"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_1003D96A983E45B9B6CF1D4B88E1AFFC"
+ "MsmKey" = "8:_0FD39C5B7F5A48F499693B5EBD2AE5BC"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
@@ -99,13 +93,13 @@
}
"Entry"
{
- "MsmKey" = "8:_147C6BD61BFA470090858AA3A4CA944E"
+ "MsmKey" = "8:_140FB0EE7DE549A1AA9FD49FFD046D7C"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_16F53590C7F142F79CDB304408F4C071"
+ "MsmKey" = "8:_198B7CA131364E929A7662DCFB866056"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
@@ -117,6 +111,36 @@
}
"Entry"
{
+ "MsmKey" = "8:_1BC0095AF28F4FA89B8C63C9A1E6E4CA"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_1EB34EF8EFB84BAF952F92AD02EEB00C"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_1F318EF1030C4ED9B2162F3E749928C9"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_1F67285315FC41FEAD20CC279BA559E5"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_1FE4A1BCE4CF47B0913F22635CA49421"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_1FE7B02CBBA5493DA5E90CC441A198FC"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -129,19 +153,13 @@
}
"Entry"
{
- "MsmKey" = "8:_219C81C4CE0E4B1F9B9DF5663E0F1B63"
+ "MsmKey" = "8:_21E30C0D42E346E6AB01C21D75F0DF7A"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_22F08663404443AA91939E292AB9EA62"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_243C5F99114A4A838E2405B681D809A7"
+ "MsmKey" = "8:_220B4A38A15E4E93AE58C0F26380CF64"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
@@ -153,31 +171,25 @@
}
"Entry"
{
- "MsmKey" = "8:_25924261CBC04C44BEC4BB9315FDD8A1"
+ "MsmKey" = "8:_25F4C03698E3469A813F646D1A701128"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_261ECF96768140EE8BED524E5801C73E"
+ "MsmKey" = "8:_260B09ECB5DE4A84BEB6E45CE0B81468"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_2772CB6509D248C38E00C9DAC069AAA2"
+ "MsmKey" = "8:_2B230411C4164E44BF5F32F5522C2E72"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_28FAB63544134AE18811EE359A89CE43"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_2B778AAA62344C89AEBE3ED04206B98F"
+ "MsmKey" = "8:_2B6D67A102F94A34B2F81097EF347E5B"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
@@ -195,6 +207,12 @@
}
"Entry"
{
+ "MsmKey" = "8:_2CC71CE8C757405BA87BBA216DEB9E22"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_2CC8B012C0CB4DFC8F2223F62310125F"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -207,61 +225,43 @@
}
"Entry"
{
- "MsmKey" = "8:_32A6C2613C204CD5AA429653B1BF0AC1"
+ "MsmKey" = "8:_2E71600E2D4849F7B82A704EAF49BA9A"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_34198A1A1DE44B4DAF176388951CF0D9"
+ "MsmKey" = "8:_3114A56D3DCC4735998506E86FB0870B"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
