Changeset: 3368ab1a9303 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/3368ab1a9303
Branch: Dec2023
Log Message:
Merge heads.
diffs (148 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -85,7 +85,7 @@ Name: %{name}
Version: %{version}
Release: %{release}
Summary: Monet Database Management System
-Vendor: MonetDB BV <[email protected]>
+Vendor: MonetDB Foundation <[email protected]>
Group: Applications/Databases
License: MPL-2.0
diff --git a/NT/mkodbcwxs.py b/NT/mkodbcwxs.py
--- a/NT/mkodbcwxs.py
+++ b/NT/mkodbcwxs.py
@@ -65,7 +65,7 @@ def main():
print(r'<?xml version="1.0"?>')
print(r'<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi";>')
print(r' <Product Id="*" Language="1033" Manufacturer="MonetDB"
Name="MonetDB ODBC Driver" UpgradeCode="{}"
Version="{}">'.format(upgradecode[arch], sys.argv[1]))
- print(r' <Package Id="*" Comments="MonetDB ODBC Driver"
Compressed="yes" InstallerVersion="301" Keywords="MonetDB SQL ODBC"
Languages="1033" Manufacturer="MonetDB BV" Platform="{}"/>'.format(arch))
+ print(r' <Package Id="*" Comments="MonetDB ODBC Driver"
Compressed="yes" InstallerVersion="301" Keywords="MonetDB SQL ODBC"
Languages="1033" Manufacturer="MonetDB Foundation"
Platform="{}"/>'.format(arch))
print(r' <MajorUpgrade AllowDowngrades="no" DowngradeErrorMessage="A
later version of [ProductName] is already installed."
AllowSameVersionUpgrades="no"/>')
print(r' <WixVariable Id="WixUILicenseRtf" Value="share\license.rtf"/>')
print(r' <WixVariable Id="WixUIBannerBmp" Value="share\banner.bmp"/>')
diff --git a/NT/mksqlwxs.py b/NT/mksqlwxs.py
--- a/NT/mksqlwxs.py
+++ b/NT/mksqlwxs.py
@@ -76,7 +76,7 @@ def main():
print(r'<?xml version="1.0"?>')
print(r'<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi";>')
print(r' <Product Id="*" Language="1033" Manufacturer="MonetDB"
Name="MonetDB5" UpgradeCode="{}" Version="{}">'.format(upgradecode[arch],
sys.argv[1]))
- print(r' <Package Id="*" Comments="MonetDB5/SQL Server and Client"
Compressed="yes" InstallerVersion="301" Keywords="MonetDB5 MonetDB SQL
Database" Languages="1033" Manufacturer="MonetDB BV"
Platform="{}"/>'.format(arch))
+ print(r' <Package Id="*" Comments="MonetDB5/SQL Server and Client"
Compressed="yes" InstallerVersion="301" Keywords="MonetDB5 MonetDB SQL
Database" Languages="1033" Manufacturer="MonetDB Foundation"
Platform="{}"/>'.format(arch))
print(r' <Upgrade Id="{}">'.format(geomupgradecode[arch]))
# up to and including 11.29.3, the geom module can not be
# uninstalled if MonetDB/SQL is not installed; this somehow also
diff --git a/clients/mapilib/mapi.rc b/clients/mapilib/mapi.rc
--- a/clients/mapilib/mapi.rc
+++ b/clients/mapilib/mapi.rc
@@ -19,7 +19,7 @@ BEGIN
BLOCK "040904b0" // US-English; Unicode
BEGIN
VALUE "Comments", "\0"
- VALUE "CompanyName", "MonetDB B.V.\0"
+ VALUE "CompanyName", "MonetDB Foundation\0"
VALUE "FileDescription", "MonetDB Application Interface DLL\0"
VALUE "FileVersion", sversion(11,49,2)
VALUE "InternalName", "Mapi\0"
diff --git a/clients/odbc/driver/driver.rc b/clients/odbc/driver/driver.rc
--- a/clients/odbc/driver/driver.rc
+++ b/clients/odbc/driver/driver.rc
@@ -19,7 +19,7 @@ BEGIN
BLOCK "040904b0" // US-English; Unicode
BEGIN
VALUE "Comments", "\0"
- VALUE "CompanyName", "MonetDB B.V.\0"
+ VALUE "CompanyName", "MonetDB Foundation\0"
VALUE "FileDescription", "MonetDB ODBC Driver DLL\0"
VALUE "FileVersion", sversion(11,49,2)
VALUE "InternalName", "MonetODBC\0"
diff --git a/clients/odbc/winsetup/setup.rc b/clients/odbc/winsetup/setup.rc
--- a/clients/odbc/winsetup/setup.rc
+++ b/clients/odbc/winsetup/setup.rc
@@ -81,7 +81,7 @@ BEGIN
BEGIN
BLOCK "040904e4"
BEGIN
- VALUE "CompanyName", "MonetDB B.V."
+ VALUE "CompanyName", "MonetDB Foundation"
VALUE "FileDescription", "MonetDB ODBC Setup DLL"
VALUE "FileVersion", sversion(11,49,2)
VALUE "InternalName", "MonetODBCs.dll"
diff --git a/cmake/monetdb-deb-packages.cmake b/cmake/monetdb-deb-packages.cmake
--- a/cmake/monetdb-deb-packages.cmake
+++ b/cmake/monetdb-deb-packages.cmake
@@ -10,7 +10,7 @@
# Copyright 1997 - July 2008 CWI.
#]]
-set(CPACK_DEBIAN_PACKAGE_MAINTAINER "MonetDB BV <[email protected]>")
+set(CPACK_DEBIAN_PACKAGE_MAINTAINER "MonetDB Foundation <[email protected]>")
set(CPACK_DEB_COMPONENT_INSTALL ON)
set(CPACK_DEBIAN_PACKAGE_GENERATE_SHLIBS OFF)
set(CPACK_DEBIAN_FILE_NAME DEB-DEFAULT)
diff --git a/cmake/monetdb-rpm-packages.cmake b/cmake/monetdb-rpm-packages.cmake
--- a/cmake/monetdb-rpm-packages.cmake
+++ b/cmake/monetdb-rpm-packages.cmake
@@ -19,7 +19,7 @@ endif()
set(CPACK_RPM_COMPONENT_INSTALL ON)
#set(CPACK_RPM_FILENAME RPM-DEFAULT)
set(CPACK_RPM_PACKAGE_SUMMARY "MonetDB - Monet Database Management System")
-set(CPACK_RPM_PACKAGE_VENDOR "MonetDB BV <[email protected]>")
+set(CPACK_RPM_PACKAGE_VENDOR "MonetDB Foundation <[email protected]>")
set(CPACK_RPM_PACKAGE_LICENSE "MPLv2.0")
set(CPACK_RPM_PACKAGE_GROUP "Applications/Databases")
set(CPACK_RPM_PACKAGE_URL "https://www.monetdb.org/";)
diff --git a/debian/control b/debian/control
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
Source: monetdb
Section: database
Priority: optional
-Maintainer: MonetDB BV <[email protected]>
+Maintainer: MonetDB Foundation <[email protected]>
Homepage: https://www.monetdb.org/
Vcs-Browser: https://dev.monetdb.org/hg/MonetDB/
Vcs-Hg: https://dev.monetdb.org/hg/MonetDB/ -b Dec2023
diff --git a/gdk/gdk_logger.c b/gdk/gdk_logger.c
--- a/gdk/gdk_logger.c
+++ b/gdk/gdk_logger.c
@@ -2518,6 +2518,12 @@ log_activate(logger *lg)
rotation_unlock(lg);
return GDK_FAIL;
}
+ /* file size of 2 means only endian indicator present
+ * (i.e. effectively empty) */
+ if (current_file_size <= 2) {
+ rotation_unlock(lg);
+ return GDK_SUCCEED;
+ }
if (!lg->flushnow &&
!lg->current->next &&
diff --git a/gdk/libbat.rc b/gdk/libbat.rc
--- a/gdk/libbat.rc
+++ b/gdk/libbat.rc
@@ -19,7 +19,7 @@ BEGIN
BLOCK "040904b0" // US-English; Unicode
BEGIN
VALUE "Comments", "\0"
- VALUE "CompanyName", "MonetDB B.V.\0"
+ VALUE "CompanyName", "MonetDB Foundation\0"
VALUE "FileDescription", "MonetDB Goblin Database Kernel DLL\0"
VALUE "FileVersion", sversion(11,49,2)
VALUE "InternalName", "libbat\0"
diff --git a/monetdb5/tools/libmonetdb5.rc b/monetdb5/tools/libmonetdb5.rc
--- a/monetdb5/tools/libmonetdb5.rc
+++ b/monetdb5/tools/libmonetdb5.rc
@@ -19,7 +19,7 @@ BEGIN
BLOCK "040904b0" // US-English; Unicode
BEGIN
VALUE "Comments", "\0"
- VALUE "CompanyName", "MonetDB B.V.\0"
+ VALUE "CompanyName", "MonetDB Foundation\0"
VALUE "FileDescription", "MonetDB5 Library DLL\0"
VALUE "FileVersion", sversion(11,49,2)
VALUE "InternalName", "libmonetdb5\0"
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
