Changeset: 5e82aae6cbfa for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5e82aae6cbfa
Added Files:
buildtools/ChangeLog.Oct2012
clients/ChangeLog.Oct2012
clients/python/monetdb/control.py
clients/python/test/control.py
gdk/ChangeLog.Oct2012
gdk/gdk_calc.h
gdk/gdk_calc_compare.h
gdk/gdk_group.c
geom/ChangeLog.Oct2012
java/ChangeLog.Oct2012
monetdb5/ChangeLog.Oct2012
sql/ChangeLog.Oct2012
sql/backends/monet5/datacell/Tests/TestingRecipe
sql/backends/monet5/datacell/Tests/dcload.sql
sql/backends/monet5/datacell/Tests/dcload.stable.err
sql/backends/monet5/datacell/Tests/dcload.stable.out
sql/backends/monet5/datacell/Tests/emili/README
sql/backends/monet5/datacell/Tests/emili/emili.sql
sql/backends/monet5/datacell/Tests/emili/sensor.log.gz
sql/backends/monet5/datacell/Tests/scenario07.sql
sql/test/BugTracker-2012/Tests/cast-tinyint-Bug-3137.sql
sql/test/BugTracker-2012/Tests/cast-tinyint-Bug-3137.stable.err
sql/test/BugTracker-2012/Tests/cast-tinyint-Bug-3137.stable.out
sql/test/testdb-upgrade-chain/Tests/All
sql/test/testdb-upgrade-chain/Tests/dump.SQL.py
sql/test/testdb-upgrade-chain/Tests/dump.reqtests
sql/test/testdb-upgrade-chain/Tests/dump.stable.err
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/dump.timeout
sql/test/testdb-upgrade-chain/Tests/package.py
sql/test/testdb-upgrade-chain/Tests/package.reqtests
sql/test/testdb-upgrade-chain/Tests/package.stable.err
sql/test/testdb-upgrade-chain/Tests/package.stable.out
sql/test/testdb-upgrade-chain/Tests/unpackage.py
sql/test/testdb-upgrade-chain/Tests/unpackage.stable.err
sql/test/testdb-upgrade-chain/Tests/unpackage.stable.out
sql/test/testdb-upgrade-chain/Tests/upgrade.SQL.py
sql/test/testdb-upgrade-chain/Tests/upgrade.reqtests
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.err
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
sql/test/testdb-upgrade/Tests/All
sql/test/testdb-upgrade/Tests/dump.SQL.py
sql/test/testdb-upgrade/Tests/dump.reqtests
sql/test/testdb-upgrade/Tests/dump.stable.err
sql/test/testdb-upgrade/Tests/dump.stable.out
sql/test/testdb-upgrade/Tests/dump.stable.out.Windows
sql/test/testdb-upgrade/Tests/dump.timeout
sql/test/testdb-upgrade/Tests/unpackage.py
sql/test/testdb-upgrade/Tests/unpackage.stable.err
sql/test/testdb-upgrade/Tests/unpackage.stable.out
sql/test/testdb-upgrade/Tests/upgrade.SQL.py
sql/test/testdb-upgrade/Tests/upgrade.reqtests
sql/test/testdb-upgrade/Tests/upgrade.stable.err
sql/test/testdb-upgrade/Tests/upgrade.stable.out
sql/test/testdb/Tests/testdb-package.py
sql/test/testdb/Tests/testdb-package.reqtests
sql/test/testdb/Tests/testdb-package.stable.err
sql/test/testdb/Tests/testdb-package.stable.out
testing/ChangeLog.Oct2012
tools/merovingian/ChangeLog.Oct2012
Removed Files:
clients/RunMapprove.bat.in
clients/RunMapprove.in
clients/RunMtest.bat.in
clients/RunMtest.in
clients/Runmclient.bat.in
geom/RunMapprove.bat.in
geom/RunMapprove.in
geom/RunMserver.bat.in
geom/RunMtest.bat.in
geom/RunMtest.in
monetdb5/RunMapprove.bat.in
monetdb5/RunMapprove.in
monetdb5/RunMserver.bat.in
monetdb5/RunMserver.in
monetdb5/RunMtest.bat.in
monetdb5/RunMtest.in
sql/RunMapprove.bat.in
sql/RunMapprove.in
sql/RunMserver.bat.in
sql/RunMserver.in
sql/RunMtest.bat.in
sql/RunMtest.in
Modified Files:
.hgtags
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
README
buildtools/ChangeLog
buildtools/autogen/autogen/am.py
buildtools/autogen/autogen/msc.py
clients/ChangeLog
clients/ChangeLog-Archive
clients/ChangeLog.Jul2012
clients/Makefile.ag
clients/Tests/exports.stable.out
clients/mapiclient/Tests/stethoscope--help.stable.err
clients/mapiclient/stethoscope.c
clients/mapilib/mapi.rc
clients/odbc/driver/driver.rc
clients/odbc/winsetup/setup.rc
clients/python/monetdb/mapi.py
clients/python/setup.py
clients/python/test/dbapi20.py
clients/python3/Makefile.ag
clients/python3/setup.py
common/options/monet_options.c
common/stream/stream.c
configure.ag
debian/changelog
gdk/ChangeLog
gdk/Makefile.ag
gdk/gdk.h
gdk/gdk_align.c
gdk/gdk_bat.c
gdk/gdk_batop.c
gdk/gdk_bbp.c
gdk/gdk_calc.c
gdk/gdk_private.h
gdk/gdk_relop.mx
gdk/gdk_setop.mx
gdk/libbat.rc
geom/Makefile.ag
java/ChangeLog-Archive
java/ChangeLog.Jul2012
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
libversions
monetdb5/ChangeLog
monetdb5/ChangeLog-Archive
monetdb5/ChangeLog.Jul2012
monetdb5/Makefile.ag
monetdb5/extras/jaql/jaqlgencode.c
monetdb5/extras/jaql/json.c
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
monetdb5/mal/Tests/tst1505.mal
monetdb5/mal/Tests/tst1505.stable.out
monetdb5/mal/mal_profiler.c
monetdb5/modules/atoms/batxml.c
monetdb5/modules/kernel/aggr_be_avg.mx
monetdb5/modules/kernel/aggr_be_count.mx
monetdb5/modules/kernel/aggr_be_minmax.mx
monetdb5/modules/kernel/aggr_be_prod.mx
monetdb5/modules/kernel/aggr_be_sum.mx
monetdb5/modules/kernel/aggr_bge_avg.mx
monetdb5/modules/kernel/aggr_bge_count.mx
monetdb5/modules/kernel/aggr_bge_minmax.mx
monetdb5/modules/kernel/aggr_bge_prod.mx
monetdb5/modules/kernel/aggr_bge_sum.mx
monetdb5/modules/kernel/aggr_ri.mx
monetdb5/modules/kernel/algebra.mx
monetdb5/modules/kernel/bat5.c
monetdb5/modules/kernel/batcolor.c
monetdb5/modules/kernel/batmmath.c
monetdb5/modules/kernel/batstr.c
monetdb5/modules/kernel/group.mx
monetdb5/modules/mal/Tests/remote03.stable.out
monetdb5/modules/mal/batcalc.c
monetdb5/modules/mal/batcalc.mal
monetdb5/modules/mal/batcalc.mal.sh
monetdb5/modules/mal/batmtime.mal
monetdb5/modules/mal/batmtime.mal.sh
monetdb5/modules/mal/cluster.c
monetdb5/modules/mal/mkey.c
monetdb5/modules/mal/pcre.c
monetdb5/modules/mal/zorder.c
monetdb5/optimizer/Tests/AEexample.stable.out
monetdb5/optimizer/Tests/inline02.stable.out
monetdb5/optimizer/Tests/inline03.stable.out
monetdb5/optimizer/Tests/inline04.stable.out
monetdb5/optimizer/Tests/inline06.stable.out
monetdb5/optimizer/Tests/inline07.stable.out
monetdb5/optimizer/Tests/remap.stable.out
monetdb5/optimizer/Tests/roberto1.stable.out
monetdb5/optimizer/Tests/tst4800.stable.out
monetdb5/optimizer/Tests/tst4820.stable.out
monetdb5/optimizer/Tests/tst4900.stable.out
monetdb5/optimizer/opt_dataflow.c
monetdb5/optimizer/opt_groups.c
monetdb5/optimizer/opt_pipes.c
monetdb5/optimizer/opt_prelude.c
monetdb5/optimizer/opt_prelude.h
monetdb5/tools/libmonetdb5.rc
sql/Makefile.ag
sql/backends/monet5/LSST/lsst.c
sql/backends/monet5/Tests/optimizers.stable.err
sql/backends/monet5/UDF/udf.c
sql/backends/monet5/datacell/50_datacell.mal
sql/backends/monet5/datacell/50_datacell.sql
sql/backends/monet5/datacell/Tests/All
sql/backends/monet5/datacell/Tests/basket00.mal
sql/backends/monet5/datacell/Tests/dctemper00.sql
sql/backends/monet5/datacell/Tests/durac00.sql
sql/backends/monet5/datacell/Tests/emitter00.mal
sql/backends/monet5/datacell/Tests/receptor00.mal
sql/backends/monet5/datacell/Tests/scenario00.sql
sql/backends/monet5/datacell/Tests/scenario00.stable.out
sql/backends/monet5/datacell/Tests/scenario01.sql
sql/backends/monet5/datacell/Tests/scenario02.sql
sql/backends/monet5/datacell/Tests/scenario03.sql
sql/backends/monet5/datacell/Tests/scenario03.stable.out
sql/backends/monet5/datacell/actuator.c
sql/backends/monet5/datacell/basket.c
sql/backends/monet5/datacell/basket.h
sql/backends/monet5/datacell/basket.mal
sql/backends/monet5/datacell/datacell.c
sql/backends/monet5/datacell/datacell.h
sql/backends/monet5/datacell/datacell.mal
sql/backends/monet5/datacell/emitter.c
sql/backends/monet5/datacell/emitter.h
sql/backends/monet5/datacell/emitter.mal
sql/backends/monet5/datacell/opt_datacell.c
sql/backends/monet5/datacell/petrinet.c
sql/backends/monet5/datacell/petrinet.h
sql/backends/monet5/datacell/receptor.c
sql/backends/monet5/datacell/receptor.h
sql/backends/monet5/datacell/receptor.mal
sql/backends/monet5/datacell/sensor.c
sql/backends/monet5/sql.mx
sql/test/BugTracker-2011/Tests/func_iter_vs_bulk.Bug-2826.stable.out
sql/test/BugTracker-2012/Tests/All
sql/test/Tests/setoptimizer.stable.err
sql/test/Tests/setoptimizer.stable.out
sql/test/leaks/Tests/check0.stable.out
sql/test/leaks/Tests/check1.stable.out
sql/test/leaks/Tests/check2.stable.out
sql/test/leaks/Tests/check3.stable.out
sql/test/leaks/Tests/check4.stable.out
sql/test/leaks/Tests/check5.stable.out
sql/test/leaks/Tests/drop3.stable.out
sql/test/leaks/Tests/select1.stable.out
sql/test/leaks/Tests/select2.stable.out
sql/test/leaks/Tests/temp1.stable.out
sql/test/leaks/Tests/temp2.stable.out
sql/test/leaks/Tests/temp3.stable.out
sql/test/testdb/Tests/All
testing/Mtest.py.in
tools/merovingian/ChangeLog-Archive
tools/merovingian/ChangeLog.Jul2012
tools/mserver/mserver5.1
vertoo.config
vertoo.data
Branch: xid
Log Message:
Merge with default branch.
diffs (truncated from 471536 to 300 lines):
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -492,3 +492,6 @@ 8189deaa7dd5956a9bd6d0579519b6872eea2925
bccc66e2bdff8af6b7568a78ca47bdde894dcc55 Jul2012_5
8189deaa7dd5956a9bd6d0579519b6872eea2925 Jul2012_release
e89d2bbb01411ab72a2902d60b364427565d4a44 Jul2012_release
+8d673fe2015149fe44c2ba2d048aae50da6eb48e Jul2012_7
+322e81ffa03687b5be8c37208cdd6808d1347091 Jul2012_SP1_release
+e89e4367f1106e7bc85a0a37bbb5bccf655a493d Oct2012_root
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -1,5 +1,5 @@
%define name MonetDB
-%define version 11.12.0
+%define version 11.14.0
%{!?buildno: %define buildno %(date +%Y%m%d)}
# groups of related archs
@@ -27,7 +27,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/Jul2012/%{name}-%{version}.tar.bz2
+Source:
http://dev.monetdb.org/downloads/sources/Jul2012-SP1/%{name}-%{version}.tar.bz2
BuildRequires: bison
BuildRequires: bzip2-devel
@@ -43,7 +43,8 @@ BuildRequires: libxml2-devel
BuildRequires: openssl-devel
BuildRequires: pcre-devel >= 4.5
BuildRequires: perl
-BuildRequires: python
+BuildRequires: python-devel
+BuildRequires: python3-devel
# BuildRequires: raptor-devel >= 1.4.16
BuildRequires: readline-devel
BuildRequires: ruby
@@ -57,7 +58,9 @@ BuildRequires: zlib-devel
Obsoletes: %{name}-devel
%define perl_libdir %(perl -MConfig -e '$x=$Config{installvendorarch}; $x =~
s|$Config{vendorprefix}/||; print $x;')
-%if ! (0%{?fedora} > 12 || 0%{?rhel} > 5)
+# need to define python_sitelib on RHEL 5 and older
+# no need to define python3_sitelib: it's defined by python3-devel
+%if 0%{?rhel} && 0%{?rhel} <= 5
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from
distutils.sysconfig import get_python_lib; print(get_python_lib())")}
%endif
%{!?gem_dir: %global gem_dir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)}
@@ -475,10 +478,8 @@ fi
Summary: MonetDB5 SQL server modules
Group: Applications/Databases
Requires: MonetDB5-server = %{version}-%{release}
-%if (0%{?fedora} > 14)
# for systemd-tmpfiles
Requires: systemd-units
-%endif
Obsoletes: MonetDB-SQL-devel
Obsoletes: %{name}-SQL
@@ -491,24 +492,16 @@ accelerators. It also has an SQL fronte
This package contains the SQL frontend for MonetDB5. If you want to
use SQL with MonetDB, you will need to install this package.
-%if (0%{?fedora} > 14)
%post SQL-server5
systemd-tmpfiles --create %{_sysconfdir}/tmpfiles.d/monetdbd.conf
-%endif
%files SQL-server5
%defattr(-,root,root)
%{_bindir}/monetdb
%{_bindir}/monetdbd
%dir %attr(775,monetdb,monetdb) %{_localstatedir}/log/monetdb
-%if (0%{?fedora} > 14)
# Fedora 15 and newer
%{_sysconfdir}/tmpfiles.d/monetdbd.conf
-%else
-# Fedora 14 and older
-%dir %attr(775,monetdb,monetdb) %{_localstatedir}/run/monetdb
-%exclude %{_sysconfdir}/tmpfiles.d/monetdbd.conf
-%endif
%config(noreplace) %{_localstatedir}/monetdb5/dbfarm/.merovingian_properties
%{_libdir}/monetdb5/autoload/*_sql.mal
%{_libdir}/monetdb5/lib_sql.so
@@ -548,6 +541,28 @@ program.
%{python_sitelib}/python_monetdb-*.egg-info
%doc clients/python/README.rst
+%package -n python3-monetdb
+Summary: Native MonetDB client Python3 API
+Group: Applications/Databases
+Requires: python3
+BuildArch: noarch
+
+%description -n python3-monetdb
+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 files needed to use MonetDB from a Python3
+program.
+
+%files -n python3-monetdb
+%defattr(-,root,root)
+%dir %{python3_sitelib}/monetdb
+%{python3_sitelib}/monetdb/*
+%{python3_sitelib}/python_monetdb-*.egg-info
+%doc clients/python3/README.rst
+
%package testing
Summary: MonetDB - Monet Database Management System
Group: Applications/Databases
@@ -637,6 +652,7 @@ developer, but if you do want to test, t
--with-perl=yes \
--with-pthread=yes \
--with-python=yes \
+ --with-python3=yes \
--with-readline=yes \
--with-rubygem=yes \
--with-rubygem-dir="%{gem_dir}" \
@@ -679,6 +695,31 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libmonet
rm -fr $RPM_BUILD_ROOT
%changelog
+* Mon Aug 13 2012 Sjoerd Mullender <sjo...@acm.org> - 11.11.7-20120813
+- Rebuilt.
+
+* Thu Aug 2 2012 Fabian Groffen <fab...@cwi.nl> - 11.11.7-20120813
+- merovingian: Starting a server now waits for as long as the server needs to
possibly
+ recover, bug #3134. In case of a long wait, the monetdbd logfile
+ gives extra information on what the server is doing to recover.
+- merovingian: Fixed a crash of monetdbd when local databases were unshared,
bug #3135
+
+* Thu Aug 2 2012 Fabian Groffen <fab...@cwi.nl> - 11.11.7-20120813
+- monetdb5: The server now distinguishes between starting and started states,
+ such that monetdbd can wait for it to finish starting.
+
+* Fri Jul 20 2012 Fabian Groffen <fab...@cwi.nl> - 11.11.7-20120813
+- java: Fixed adaptive cache size used when retrieving results, not to cause
+ divide by zero errors when memory gets short, bug #3119.
+
+* Wed Jul 18 2012 Fabian Groffen <fab...@cwi.nl> - 11.11.7-20120813
+- merovingian: Resolved a problem where automatic starting of a database
initiated by
+ multiple clients at the same time could cause failed starts. Bug #3107
+
+* Tue Jul 17 2012 Fabian Groffen <fab...@cwi.nl> - 11.11.7-20120813
+- clients: mclient no longer prints the SQLSTATE at the start of each error
+ returned by the SQL-server.
+
* Tue Jul 10 2012 Fabian Groffen <fab...@monetdb.org> - 11.11.5-20120710
- Rebuilt.
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
@@ -574,7 +574,7 @@
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:11.12.0"
+ "ProductVersion" = "8:11.14.0"
"Manufacturer" = "8:MonetDB"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:http://www.monetdb.org/";
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
@@ -432,7 +432,7 @@
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:11.12.0"
+ "ProductVersion" = "8:11.14.0"
"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
@@ -2073,7 +2073,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_667BD650736E43C9A8B6899179FA0CAA"
{
- "SourcePath" =
"8:share\\doc\\MonetDB-SQL-11.12.0\\dump-restore.txt"
+ "SourcePath" =
"8:share\\doc\\MonetDB-SQL-11.14.0\\dump-restore.txt"
"TargetName" = "8:dump-restore.txt"
"Tag" = "8:"
"Folder" = "8:_6C21CE578F0941D09FDD9951A229FF37"
@@ -2633,7 +2633,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A9DB6CF8297A4BEEAF7A6D4958A4B0D6"
{
- "SourcePath" =
"8:share\\doc\\MonetDB-SQL-11.12.0\\dump-restore.html"
+ "SourcePath" =
"8:share\\doc\\MonetDB-SQL-11.14.0\\dump-restore.html"
"TargetName" = "8:dump-restore.html"
"Tag" = "8:"
"Folder" = "8:_6C21CE578F0941D09FDD9951A229FF37"
@@ -3757,7 +3757,7 @@
{
"{9EF0B969-E518-4E46-987F-47570745A589}:_6C21CE578F0941D09FDD9951A229FF37"
{
- "Name" = "8:MonetDB-SQL-11.12.0"
+ "Name" = "8:MonetDB-SQL-11.14.0"
"AlwaysCreate" = "11:FALSE"
"Condition" = "8:"
"Transitive" = "11:FALSE"
@@ -3807,7 +3807,7 @@
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:11.12.0"
+ "ProductVersion" = "8:11.14.0"
"Manufacturer" = "8:MonetDB"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:http://www.monetdb.org/";
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
@@ -574,7 +574,7 @@
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:11.12.0"
+ "ProductVersion" = "8:11.14.0"
"Manufacturer" = "8:MonetDB"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:http://www.monetdb.org/";
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
@@ -432,7 +432,7 @@
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:11.12.0"
+ "ProductVersion" = "8:11.14.0"
"Manufacturer" = "8:MonetDB"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:http://www.monetdb.org/";
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
@@ -1933,7 +1933,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_667BD650736E43C9A8B6899179FA0CAA"
{
- "SourcePath" =
"8:share\\doc\\MonetDB-SQL-11.12.0\\dump-restore.txt"
+ "SourcePath" =
"8:share\\doc\\MonetDB-SQL-11.14.0\\dump-restore.txt"
"TargetName" = "8:dump-restore.txt"
"Tag" = "8:"
"Folder" = "8:_6C21CE578F0941D09FDD9951A229FF37"
@@ -2753,7 +2753,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A9DB6CF8297A4BEEAF7A6D4958A4B0D6"
{
- "SourcePath" =
"8:share\\doc\\MonetDB-SQL-11.12.0\\dump-restore.html"
+ "SourcePath" =
"8:share\\doc\\MonetDB-SQL-11.14.0\\dump-restore.html"
"TargetName" = "8:dump-restore.html"
"Tag" = "8:"
"Folder" = "8:_6C21CE578F0941D09FDD9951A229FF37"
@@ -3757,7 +3757,7 @@
{
"{9EF0B969-E518-4E46-987F-47570745A589}:_6C21CE578F0941D09FDD9951A229FF37"
{
- "Name" = "8:MonetDB-SQL-11.12.0"
+ "Name" = "8:MonetDB-SQL-11.14.0"
"AlwaysCreate" = "11:FALSE"
"Condition" = "8:"
"Transitive" = "11:FALSE"
@@ -3807,7 +3807,7 @@
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:11.12.0"
+ "ProductVersion" = "8:11.14.0"
"Manufacturer" = "8:MonetDB"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:http://www.monetdb.org/";
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
@@ -689,13 +689,13 @@
#define PACKAGE_NAME "MonetDB"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "MonetDB 11.12.0"
+#define PACKAGE_STRING "MonetDB 11.14.0"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "MonetDB"
/* Define to the version of this package. */
-#define PACKAGE_VERSION "11.12.0"
+#define PACKAGE_VERSION "11.14.0"
/* Path separator */
#define PATH_SEP ';'
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
