--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog file for monetdb-java
 # This file is updated with Maddlog
 
+* Thu Sep 26 2019 Sjoerd Mullender <sjoerd@acm.org>
+- Compiled and released new jar files: monetdb-jdbc-2.29.jre7.jar,
+  monetdb-mcl-1.18.jre7.jar and jdbcclient.jre7.jar
+
+* Wed Sep 25 2019 Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
+- The jar files are now named according to Java version compatibility.
+  For example, the monetdb-jdbc-2.29.jre7.jar file should be used with
+  Java 7 or higher.
+
 * Wed Sep 18 2019 Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
 - Corrected method DatabaseMetaData.getBestRowIdentifier(). It used to
   return columns of both primary key and unique constraints. Now it only
@@ -12,9 +21,6 @@
   and replacing method calls by direct operations on variables.
 
 * Wed Sep  4 2019 Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
-- The jar files are now named according to Java version compatibility.
-  For example, the monetdb-jdbc-2.29.jre7.jar file should be used with
-  Java 7 (or higher).
 - Corrected JdbcClient program: the dumping of a view DDL was incorrect when
   the view creation statement was not starting with "create view ", such as
   when it was created using "create or replace view". It now shows the

--- a/ChangeLog-Archive
+++ b/ChangeLog-Archive
@@ -1,5 +1,92 @@
-# DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
-# This file contains past monetdb-java ChangeLog entries
+# ChangeLog-Archive file for monetdb-java
+# This file contains all past monetdb-java ChangeLog entries
+# For every new release the ChangeLog is prepended to this file.
+
+* Thu Sep 26 2019 Sjoerd Mullender <sjoerd@acm.org>
+- Compiled and released new jar files: monetdb-jdbc-2.29.jre7.jar,
+  monetdb-mcl-1.18.jre7.jar and jdbcclient.jre7.jar
+
+* Wed Sep 25 2019 Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
+- The jar files are now named according to Java version compatibility.
+  For example, the monetdb-jdbc-2.29.jre7.jar file should be used with
+  Java 7 or higher.
+
+* Wed Sep 18 2019 Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
+- Corrected method DatabaseMetaData.getBestRowIdentifier(). It used to
+  return columns of both primary key and unique constraints. Now it only
+  returns the columns of the primary key if it has one, else columns of
+  a unique constraint.
+
+* Wed Sep 11 2019 Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
+- Optimized parse() method of TupleLineParser by creating less helper objects
+  and replacing method calls by direct operations on variables.
+
+* Wed Sep  4 2019 Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
+- Corrected JdbcClient program: the dumping of a view DDL was incorrect when
+  the view creation statement was not starting with "create view ", such as
+  when it was created using "create or replace view". It now shows the
+  value as stored in sys.tables.query field, similar to mclient program.
+
+* Thu Aug 22 2019 Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
+- Improved JdbcClient program by including the schema prefix when dumping
+  schema objects. It now behaves more similar to: mclient -D -N.
+- Improved JdbcClient program. It now also dumps definitions of MERGE TABLE,
+  REMOTE TABLE, REPLICA TABLE and STREAM TABLE when dumping (all) tables.
+
+* Wed Aug 14 2019 Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
+- Improved MonetDatabaseMetaData methods:
+  - getNumericFunctions(): it now includes functions: code, space and sys.alpha
+  - getNumericFunctions(): it no longer lists functions: not_uniques and rotate_xor_hash
+  - getStringFunctions(): it now includes functions: json.isarray, json.isobject,
+      json.isvalid, sys.reverse which accept a string value as argument
+  - getStringFunctions(): it no longer lists functions: copyfrom, get_value_for, next_value_for, restart.
+  - getSystemFunctions(): it now includes system functions: get_value_for, hash,
+      next_value_for, sys.columnsize, sys.debug, sys.hashsize, sys.heapsize,
+      sys.imprintsize, sys.isauuid, sys.md5, sys.newurl, sys.password_hash, isaurl
+  - getSystemFunctions(): it no longer lists function: getlimit.
+  Also some functions require the prefix "sys." or "json." when used
+  from another schema. This is now included in the names returned by
+  methods getNumericFunctions(), getStringFunctions(), getSystemFunctions()
+  and getTimeDateFunctions().
+
+* Wed Jul 31 2019 Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
+- Corrected MonetDatabaseMetaData methods:
+  - getNumericFunctions(): it now includes function: pi.
+  - getSystemFunctions(): it no longer lists numeric functions: pi and rand.
+  - supportsSchemasInIndexDefinitions(): changed from true to false
+- Optimised MonetStatement memory resource usage by only creating an ArrayList
+  and ReentrantLock object when the batch methods addBatch() or executeBatch()
+  are called. In most Statement usages those methods are never called.
+- Implemented method MonetClob.getAsciiStream().
+
+* Thu Mar 21 2019 Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
+- Added implementation of java.sql.CallableStatement interface. Some standard
+  Java applications require this JDBC interface for executing SQL stored procedures.
+  This implementation resolves request: https://www.monetdb.org/bugzilla/show_bug.cgi?id=6402
+
+* Thu Mar  7 2019 Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
+- Improved MonetDatabaseMetaData methods:
+  - getNumericFunctions(): it now includes functions: degrees, fuse, ms_round, ms_str, ms_trunc and radians.
+  - getStringFunctions(): it now includes function: position.
+  - supportsIntegrityEnhancementFacility() now returns false, as we do not enforce CHECK constraints yet.
+
+* Thu Feb  7 2019 Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
+- Improved MonetDatabaseMetaData methods:
+  - getNumericFunctions(): it no longer lists aggregate functions: avg, prod and sum
+  - getSystemFunctions(): it no longer lists timedate function: extract
+  - getTimeDateFunctions(): it now also lists functions: date_trunc, epoch
+- Corrected MonetDatabaseMetaData method getTypeInfo() for result column
+  SEARCHABLE. It now returns DatabaseMetaData.typeSearchable for all
+  string data types including 'inet','json','url','uuid' and 'blob'.
+
+* Thu Sep 20 2018 Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
+- Improved example program SQLcopyinto.java and moved it to tests directory
+  for automatic testing.
+
+* Thu Jun 28 2018 Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
+- Corrected return values of DatabaseMetaData methods
+  allTablesAreSelectable() and allProceduresAreCallable().
+  They used to return true but now return false.
 
 * Wed May 23 2018 Sjoerd Mullender <sjoerd@acm.org>
 - Compiled and released new jars: monetdb-jdbc-2.28.jar, monetdb-mcl-1.17.jar