Changeset: e0efcf97ebc9 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/e0efcf97ebc9
Modified Files:
clients/mapiclient/mclient.c
Branch: client_interrupts
Log Message:
Merge with default
diffs (truncated from 254454 to 300 lines):
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
[bumpversion]
-current_version = 11.44.0
+current_version = 11.46.0
commit = False
tag = False
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -762,3 +762,19 @@ cab90a348501b045e19cee5cebcc44f3800bd0a8
cab90a348501b045e19cee5cebcc44f3800bd0a8 Jul2021_SP5_release
5872f047d97c98d3a848514438b8f97fa446855d Jan2022_11
025239a5a6f122042798c0f1132a2c6298514e06 Jan2022_13
+025239a5a6f122042798c0f1132a2c6298514e06 Jan2022_SP2_release
+2e54857a91306cc6304825c5596f65d00595db6b Jul2021_23
+2e54857a91306cc6304825c5596f65d00595db6b Jul2021_SP6_release
+1252291e5c0ddc91ccb16d612d04e34e6a7d3bc3 Jun2020_13
+1252291e5c0ddc91ccb16d612d04e34e6a7d3bc3 Jun2020_SP2_release
+59de1ee118d4eccc072c0cf3938f90635a7db311 Jan2022_15
+59de1ee118d4eccc072c0cf3938f90635a7db311 Jan2022_SP3_release
+38ba6e40ba9148c762fe4a4b40f4937f86e516b6 Jul2021_25
+38ba6e40ba9148c762fe4a4b40f4937f86e516b6 Jul2021_SP7_release
+470e524a786ee0e94c7901ec98d95ac351a0e472 Sep2022_root
+9785fa2a471fe32495e07479edf110335ddaa750 Jan2022_17
+26ffeb5af5240c807a6583fd6eb4ee2c9cd210d2 Jan2022_19
+3191fee438036ac0da1e6f31481b9681399123b5 Jan2022_21
+3191fee438036ac0da1e6f31481b9681399123b5 Jan2022_SP4_release
+bdd04053973daa8a786a30e07b2bf1bd8aa6ebf1 Jul2021_27
+bdd04053973daa8a786a30e07b2bf1bd8aa6ebf1 Jul2021_SP8_release
diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -70,7 +70,6 @@ if(NOT HAVE_SYS_SOCKET_H)
set(CMAKE_EXTRA_INCLUDE_FILES "winsock.h")
endif()
endif()
-set(CMAKE_REQUIRED_INCLUDES "/usr/include")
monetdb_configure_sizes()
@@ -183,6 +182,3 @@ add_subdirectory(documentation)
if(CMAKE_SUMMARY)
monetdb_cmake_summary()
endif()
-
-
-# vim: set ts=2:sw=2:et
diff --git a/ChangeLog b/ChangeLog.Sep2022
copy from ChangeLog
copy to ChangeLog.Sep2022
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -1,5 +1,5 @@
%global name MonetDB
-%global version 11.44.0
+%global version 11.46.0
%{!?buildno: %global buildno %(date +%Y%m%d)}
# Use bcond_with to add a --with option; i.e., "without" is default.
@@ -81,7 +81,7 @@ Group: Applications/Databases
License: MPLv2.0
URL: https://www.monetdb.org/
BugURL: https://bugs.monetdb.org/
-Source:
https://www.monetdb.org/downloads/sources/Jan2022-SP2/%{name}-%{version}.tar.bz2
+Source:
https://www.monetdb.org/downloads/sources/Jan2022-SP4/%{name}-%{version}.tar.bz2
# The Fedora packaging document says we need systemd-rpm-macros for
# the _unitdir and _tmpfilesdir macros to exist; however on RHEL 7
@@ -355,6 +355,9 @@ developer.
%files client-tests
%defattr(-,root,root)
+%{_bindir}/ODBCStmtAttr
+%{_bindir}/ODBCgetInfo
+%{_bindir}/ODBCmetadata
%{_bindir}/arraytest
%{_bindir}/bincopydata
%{_bindir}/odbcsample1
@@ -365,8 +368,7 @@ developer.
%{_bindir}/smack00
%{_bindir}/smack01
%{_bindir}/streamcat
-%{_bindir}/testgetinfo
-%{_bindir}/testStmtAttr
+%{_bindir}/testcondvar
%{_bindir}/malsample.pl
%{_bindir}/sqlsample.php
%{_bindir}/sqlsample.pl
@@ -825,7 +827,6 @@ install -d -m 0775 %{buildroot}%{_rundir
rm -f %{buildroot}%{_libdir}/*.la
rm -f %{buildroot}%{_libdir}/monetdb5/*.la
rm -f %{buildroot}%{_libdir}/monetdb5/lib_opt_sql_append.so
-rm -f %{buildroot}%{_libdir}/monetdb5/lib_run_*.so
rm -f %{buildroot}%{_libdir}/monetdb5/lib_microbenchmark*.so
rm -f %{buildroot}%{_libdir}/monetdb5/lib_udf*.so
rm -f %{buildroot}%{_bindir}/monetdb_mtest.sh
@@ -848,6 +849,106 @@ fi
%endif
%changelog
+* Fri Aug 19 2022 Sjoerd Mullender <sjo...@acm.org> - 11.43.21-20220819
+- Rebuilt.
+
+* Mon Aug 15 2022 Sjoerd Mullender <sjo...@acm.org> - 11.43.19-20220815
+- Rebuilt.
+
+* Thu Aug 11 2022 Sjoerd Mullender <sjo...@acm.org> - 11.43.17-20220811
+- Rebuilt.
+- GH#7040: Memory leak detected for MAPI interface
+- GH#7298: Irresponsive database server after reading incomplete SQL
+ script.
+- GH#7308: Race condition in MVCC transaction management
+
+* Wed Aug 10 2022 Sjoerd Mullender <sjo...@acm.org> - 11.43.17-20220811
+- gdk: A bug was fixed when upgrading a database from the Oct2020 releases
+ (11.39.X) or older when the write-ahead log (WAL) was not empty and
+ contained instructions to create new tables.
+
+* Tue Aug 2 2022 Sjoerd Mullender <sjo...@acm.org> - 11.43.17-20220811
+- gdk: When destroying a bat, make sure there are no files left over in
+ the BACKUP directory since they can cause problems when the bat id
+ gets reused.
+
+* Thu Jul 28 2022 Sjoerd Mullender <sjo...@acm.org> - 11.43.17-20220811
+- gdk: Fixed an off-by-one error in the logger which caused older log files
+ to stick around longer in the write-ahead log than necessary.
+- gdk: When an empty BAT is committed, skip writing (and synchronizing to
+ disk) the heap (tail and theap) files and write 0 for their sizes to
+ the BBP.dir file. When reading the BBP.dir file, if an empty BAT is
+ encountered, set the sizes of those files to 0. This fixes potential
+ issues during startup of the server (BBPcheckbats reporting errors).
+
+* Thu Jun 23 2022 Sjoerd Mullender <sjo...@acm.org> - 11.43.17-20220811
+- merovingian: When multiple identical messages are written to the log, write
the
+ first one, and combine subsequent ones in a single message.
+
+* Wed Jun 22 2022 Sjoerd Mullender <sjo...@acm.org> - 11.43.17-20220811
+- gdk: Make sure heap files of transient bats get deleted when the bat is
+ destroyed. If the bat was a partial view (sharing the vheap but not
+ the tail), the tail file wasn't deleted.
+- gdk: Various changes were made to satisfy newer compilers.
+- gdk: The batDirtydesc and batDirtyflushed Boolean values have been deprecated
+ and are no longer used. They were both holdovers from long ago.
+- gdk: Various race conditions (data races) have been fixed.
+
+* Wed Jun 22 2022 Sjoerd Mullender <sjo...@acm.org> - 11.43.17-20220811
+- merovingian: Fixed a leak where the log file wasn't closed when it was
reopened
+ after a log rotation (SIGHUP signal).
+- merovingian: Try to deal more gracefully with "inherited" mserver5 processes.
+ This includes not complaining about an "impossible state", and allowing
+ such processes to be stopped by the monetdbd process.
+- merovingian: When a transient failure occurs during processing of a new
connection to
+ the monetdbd server, sleep for half a second so that if the transient
+ failure occurs again, the log file doesn't get swamped with error
+ messages.
+
+* Wed Jun 22 2022 Sjoerd Mullender <sjo...@acm.org> - 11.43.17-20220811
+- monetdb5: Various race conditions (data races) have been fixed.
+
+* Fri Jun 10 2022 Sjoerd Mullender <sjo...@acm.org> - 11.43.17-20220811
+- clients: Implemented dump of global grants, that is to say, grants for COPY
INTO
+ and COPY FROM which grant permission to users to write to or read from
+ files on the server (COPY INTO queries without the ON CLIENT option).
+
+* Tue May 31 2022 Sjoerd Mullender <sjo...@acm.org> - 11.43.17-20220811
+- clients: Fixed a bug where when the semicolon at the end of a COPY INTO query
+ that reads from STDIN is at exactly a 10240 byte boundary in a file,
+ the data isn't read as input for the COPY INTO but instead as a new
+ SQL query.
+
+* Fri May 20 2022 Sjoerd Mullender <sjo...@acm.org> - 11.43.17-20220811
+- gdk: All accesses to the BACKUP directory need to be protected by the
+ same lock. The lock already existed (GDKtmLock), but wasn't used
+ consistently. This is now fixed. Hopefully this makes the hot snapshot
+ code more reliable.
+
+* Fri May 20 2022 Sjoerd Mullender <sjo...@acm.org> - 11.43.15-20220520
+- Rebuilt.
+- GH#7036: Generate column names instead of labels
+
+* Thu May 19 2022 Sjoerd Mullender <sjo...@acm.org> - 11.43.15-20220520
+- gdk: All accesses to the BACKUP directory need to be protected by the
+ same lock. The lock already existed (GDKtmLock), but wasn't used
+ consistently. This is now fixed. Hopefully this makes the hot snapshot
+ code more reliable.
+
+* Tue May 10 2022 Sjoerd Mullender <sjo...@acm.org> - 11.43.15-20220520
+- gdk: When exiting, long running instructions are aborted using the same
+ mechanism that is used for query timeouts.
+
+* Mon Apr 25 2022 Sjoerd Mullender <sjo...@acm.org> - 11.43.15-20220520
+- sql: GLOBAL TEMPORARY tables are now treated like LOCAL TEMPORARY tables
+ as far as the table content is concerned. The schema information
+ stays global. This fixes an issue with concurrent access and cleanup
+ of stale data.
+
+* Thu Apr 14 2022 Sjoerd Mullender <sjo...@acm.org> - 11.43.15-20220520
+- sql: The NO CONSTRAINT option of the COPY INTO query has been removed.
+ It didn't work and it was never a good idea anyway.
+
* Fri Apr 01 2022 Sjoerd Mullender <sjo...@acm.org> - 11.43.13-20220401
- Rebuilt.
- GH#7278: BUG when there is more than one field/filter in the having
diff --git a/NT/mksqlwxs.py b/NT/mksqlwxs.py
--- a/NT/mksqlwxs.py
+++ b/NT/mksqlwxs.py
@@ -193,9 +193,9 @@ def main():
print(r' <Directory Id="lib" Name="lib">')
print(r' <Directory Id="monetdb5" Name="monetdb5">')
id = comp(features, id, 16,
- [r'lib\monetdb5\{}'.format(x) for x in sorted(filter(lambda x:
x.startswith('_') and x.endswith('.dll') and ('geom' not in x) and ('pyapi' not
in x) and ('opt_sql_append' not in x) and ('run_' not in x) and
('microbenchmark' not in x) and ('udf' not in x),
os.listdir(os.path.join(sys.argv[3], 'lib', 'monetdb5'))))])
+ [r'lib\monetdb5\{}'.format(x) for x in sorted(filter(lambda x:
x.startswith('_') and x.endswith('.dll') and ('geom' not in x) and ('pyapi' not
in x) and ('opt_sql_append' not in x) and ('microbenchmark' not in x) and
('udf' not in x), os.listdir(os.path.join(sys.argv[3], 'lib', 'monetdb5'))))])
id = comp(debug, id, 16,
- [r'lib\monetdb5\{}'.format(x) for x in sorted(filter(lambda x:
x.startswith('_') and x.endswith('.pdb') and ('geom' not in x) and
('opt_sql_append' not in x) and ('run_' not in x) and ('microbenchmark' not in
x) and ('udf' not in x), os.listdir(os.path.join(sys.argv[3], 'lib',
'monetdb5'))))])
+ [r'lib\monetdb5\{}'.format(x) for x in sorted(filter(lambda x:
x.startswith('_') and x.endswith('.pdb') and ('geom' not in x) and
('opt_sql_append' not in x) and ('microbenchmark' not in x) and ('udf' not in
x), os.listdir(os.path.join(sys.argv[3], 'lib', 'monetdb5'))))])
id = comp(geom, id, 16,
[r'lib\monetdb5\{}'.format(x) for x in sorted(filter(lambda x:
x.startswith('_') and (x.endswith('.dll') or x.endswith('.pdb')) and ('geom' in
x), os.listdir(os.path.join(sys.argv[3], 'lib', 'monetdb5'))))])
id = comp(pyapi3, id, 16,
diff --git a/README.rst b/README.rst
--- a/README.rst
+++ b/README.rst
@@ -31,8 +31,8 @@ once an hour.
.. _MonetDB: https://dev.monetdb.org/hg/MonetDB/
__ MonetDB_
-.. _github: https://github.com/MonetDB/MonetDB
-__ github_
+.. _mirror: https://github.com/MonetDB/MonetDB
+__ mirror_
Building
--------
@@ -91,8 +91,8 @@ WITH_XML2 Include xml2 support
WITH_ZLIB Include zlib support
==============
===============================================================================================
-Required packages
-.................
+Required and Optional Packages
+..............................
On Fedora, the following packages are required:
``bison``, ``cmake``, ``gcc``, ``pkgconf``, ``python3``.
diff --git a/buildtools/conf/CMakeLists.txt b/buildtools/conf/CMakeLists.txt
--- a/buildtools/conf/CMakeLists.txt
+++ b/buildtools/conf/CMakeLists.txt
@@ -23,5 +23,3 @@ if(DEVELOPMENT AND NOT WIN32)
DESTINATION ${CMAKE_INSTALL_BINDIR}
COMPONENT buildtools)
endif()
-
-# vim: set ts=2:sw=2:et
diff --git a/buildtools/conf/Maddlog b/buildtools/conf/Maddlog
--- a/buildtools/conf/Maddlog
+++ b/buildtools/conf/Maddlog
@@ -189,6 +189,9 @@ fi
file=ChangeLog.$RANDOM
+# make sure we get the correct day and month names
+export LC_ALL=en_US.utf-8
+
case "$CL" in
*/*)
cd "${CL%/*}"
diff --git a/clients/ChangeLog-Archive b/clients/ChangeLog-Archive
--- a/clients/ChangeLog-Archive
+++ b/clients/ChangeLog-Archive
@@ -1,6 +1,17 @@
# DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
# This file contains past ChangeLog entries
+* Fri Jun 10 2022 Sjoerd Mullender <sjo...@acm.org> - 11.43.17-20220811
+- Implemented dump of global grants, that is to say, grants for COPY INTO
+ and COPY FROM which grant permission to users to write to or read from
+ files on the server (COPY INTO queries without the ON CLIENT option).
+
+* Tue May 31 2022 Sjoerd Mullender <sjo...@acm.org> - 11.43.17-20220811
+- Fixed a bug where when the semicolon at the end of a COPY INTO query
+ that reads from STDIN is at exactly a 10240 byte boundary in a file,
+ the data isn't read as input for the COPY INTO but instead as a new
+ SQL query.
+
* Wed Feb 16 2022 Sjoerd Mullender <sjo...@acm.org> - 11.43.11-20220325
- Improved the handling of the \r (internal pager) command in mclient.
It now properly counts the header of table, and when a (very) long
diff --git a/clients/ChangeLog b/clients/ChangeLog.Sep2022
copy from clients/ChangeLog
copy to clients/ChangeLog.Sep2022
diff --git a/clients/NT/CMakeLists.txt b/clients/NT/CMakeLists.txt
--- a/clients/NT/CMakeLists.txt
+++ b/clients/NT/CMakeLists.txt
@@ -17,5 +17,3 @@ if(WIN32)
DESTINATION "."
COMPONENT server)
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
