--- a/ChangeLog-Archive
+++ b/ChangeLog-Archive
@@ -1,5 +1,91 @@
 # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
-# This file contains past ChangeLog entries
+# This file contains past monetdb-java ChangeLog entries
+
+* Wed Dec 21 2016 Sjoerd Mullender <sjoerd@acm.org>
+- Compiled and released new jars: monetdb-jdbc-2.24.jar, monetdb-mcl-1.14.jar
+  and updated jdbcclient.jar
+
+* Thu Nov 17 2016 Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
+- The MapiSocket object now supports getting and setting the
+  socket timeout, even before the TCP socket is created.  To set
+  the socket timeout specify it in the JDBC URL, for example:
+    jdbc:monetdb://localhost:50000/demo?so_timeout=8000
+  This enables the timeout and sets it to 8000 milliseconds (= 8 seconds).
+  By default the timeout is not set, so wait infinitely.
+
+* Thu Nov 10 2016 Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
+- Implemented Connection methods: getClientInfo(name) and getClientInfo().
+  They used to return null and empty Properties object.
+  Corrected implementation of Connection methods: setClientInfo(name, value)
+  and setClientInfo(properties). They are now processed as expected.
+  Corrected implementation of Connection.setHoldability(holdability). It now
+  throws an SQLFeatureNotSupportedException when holdability is not
+  ResultSet.HOLD_CURSORS_OVER_COMMIT (which is the only supported holdability).
+
+* Thu Oct 13 2016 Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
+- Corrected implementation of java.sql.Wrapper methods isWrapperFor()
+  and unwrap().  They now properly return expected results instead of
+  always return false or throw an SQLException.
+
+* Thu Oct  6 2016 Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
+- Corrected return values of DatabaseMetaData methods nullsAreSortedHigh(),
+  nullsAreSortedLow(), getMaxCursorNameLength(), getMaxProcedureNameLength(),
+  getMaxStatementLength() and getMaxUserNameLength().
+  Improved return values of DatabaseMetaData methods getMaxBinaryLiteralLength(),
+  getMaxCharLiteralLength() and getMaxColumnsInTable().
+- Implemented Statement methods: getQueryTimeout() and setQueryTimeout(int
+  seconds).  getQueryTimeout() used to always return 0, now it returns the
+  query timeout retrieved from the server.  setQueryTimeout(int seconds)
+  used to always throw SQLException: query time outs not supported.
+  Now it sets the query timeout for the current connection/session on
+  the server.
+
+* Thu Sep 29 2016 Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
+- Corrected ResultSet methods: getByte(), getBigDecimal(), getShort(),
+  getInt(), getLong(), getFloat() and getDouble() in case the conversion
+  to the native type failed due to a Number Format conversion error.
+  It used to silently ignore the conversion error and return 0 instead,
+  which is not correct.  Now it throws an SQLException with message
+  "Could not convert value to a number." and SQLstate "22003" meaning:
+  Numeric value out of range.
+
+* Thu Sep 22 2016 Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
+- Improved JdbcClient program when doing dump of table definition.  It now
+  outputs CREATE TABLE definition more similar to mclient program.
+
+* Thu Sep 15 2016 Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
+- Improved performance of following JDBC ResultSet and ResultSetMetaData
+  methods:
+  - ResultSet.getBoolean(column)
+  - ResultSet.getBinaryStream(column)
+  - ResultSet.getBytes(column)
+  - ResultSet.getObject(column)
+  - ResultSet.getObject(column, map)
+  - ResultSet.getDate(column)
+  - ResultSet.getTime(column)
+  - ResultSet.getTimestamp(column)
+  - ResultSet.getDate(column, calendar)
+  - ResultSet.getTime(column, calendar)
+  - ResultSet.getTimestamp(column, calendar)
+  - ResultSetMetaData.getColumnClassName(column)
+  - ResultSetMetaData.getColumnType(column)
+  - ResultSetMetaData.isCaseSensitive(column)
+  - ResultSetMetaData.isSigned(column)
+  - ResultSetMetaData.getPrecision(column)
+
+* Thu Sep  8 2016 Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
+- Improved JdbcClient program by fixing some resource leaks.
+- Extended JdbcClient program by showing elapsed time information for each
+  query or command when started in interactive mode (no -f was used at startup).
+
+* Thu Sep  1 2016 Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
+- Improved fetching and output speed of JdbcClient program for query results.
+
+* Thu Aug 11 2016 Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
+- Improved performance of method ResultSet.getObject(column_ID) significantly.
+
+* Wed Jul 13 2016 Sjoerd Mullender <sjoerd@acm.org>
+- Compiled and released new JDBC driver jar: monetdb-jdbc-2.23.jar
 
 * Thu Jul  7 2016 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> - 11.23.7-20160713
 - Corrected PROCEDURE_TYPE output value of method DatabaseMetaData.getProcedures().
@@ -28,6 +114,9 @@
   arguments of the specific overloaded function by matching the SPECIFIC_NAME
   value.
 
+* Fri Jun 10 2016 Sjoerd Mullender <sjoerd@acm.org>
+- Compiled and released new JDBC driver jar: monetdb-jdbc-2.21.jar
+
 * Thu May 26 2016 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> - 11.23.1-20160601
 - Fixed problem in DatabaseMetaData.getUDTs() when it was called with
   types parameter filled.  It used to throw SQException with message:
@@ -40,6 +129,21 @@
   It used to always return false. Now it returns true for the supported conversions.
   This fixes Bug 3460.
 
+* Thu May 12 2016 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> - 11.23.1-20160601
+- Improved JdbcClient program when presenting query data to console.
+  It used to send an SQL catalog query for each query result column
+  which slowed down the interactive response considerably.
+  These additional SQL catalog queries have been eliminated.
+
+* Thu May 12 2016 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> - 11.23.1-20160601
+- Corrected MonetResultSet.getObject(String columnName). It no longer
+  throws a NullPointerException in cases where internally a
+  MonetVirtualResultSet is used.
+
+* Sun May  8 2016 Jennie Zhang <y.zhang@cwi.nl> - 11.23.1-20160601
+- Fixed Connection.isValid(): this method should never attempt to
+  close the connection, even if an error has occurred.
+
 * Sun May  8 2016 Jennie Zhang <y.zhang@cwi.nl> - 11.23.1-20160601
 - ResultSet.setFetchSize(): added a dummy implementation to get rid
   of the SQLFeatureNotSupportedException. In MonetDB, it does not
@@ -112,20 +216,12 @@
 - Fixed a memory leak in MonetDatabaseMetaData.java for a static cache
   which kept references to closed Connection objects.
 
-* Thu May 12 2016 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> - 11.23.1-20160601
-- Improved JdbcClient program when presenting query data to console.
-  It used to send an SQL catalog query for each query result column
-  which slowed down the interactive response considerably.
-  These additional SQL catalog queries have been eliminated.
+* Tue Jan  5 2016 Sjoerd Mullender <sjoerd@acm.org>
+- Compiled and released new JDBC driver jar: monetdb-jdbc-2.19.jar
 
-* Thu May 12 2016 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> - 11.23.1-20160601
-- Corrected MonetResultSet.getObject(String columnName). It no longer
-  throws a NullPointerException in cases where internally a
-  MonetVirtualResultSet is used.
-
-* Sun May  8 2016 Jennie Zhang <y.zhang@cwi.nl> - 11.23.1-20160601
-- Fixed Connection.isValid(): this method should never attempt to
-  close the connection, even if an error has occurred.
+* Fri Oct 30 2015 Sjoerd Mullender <sjoerd@acm.org>
+- Compiled and released new jars: monetdb-jdbc-2.18.jar, monetdb-mcl-1.13.jar
+  and updated jdbcclient.jar
 
 * Thu Aug  6 2015 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> - 11.21.1-20150807
 - Improved JDBC driver to not throw NullPointerException anymore