Merge remote-tracking branch 'origin/master'

# Conflicts:
#	h2/src/docsrc/html/changelog.html

h2/src/docsrc/html/changelog.html

@@ -23,6 +23,10 @@ Change Log
 <ul>
 <li>#411: "TIMEZONE" should be "TIME ZONE" in type "TIMESTAMP WITH TIMEZONE"
 </li>
+<li>PR #418, Implement Connection#createArrayOf and PreparedStatement#setArray
+</li>
+<li>PR #427, Add MySQL compatibility functions UNIX_TIMESTAMP, FROM_UNIXTIME and DATE
+</li>
 <li>#429: Tables not found : Fix some turkish locale bugs around uppercasing
 </li>
 <li>Fixed bug in metadata locking, obscure combination of DDL and SELECT SEQUENCE.NEXTVAL required
@@ -61,6 +65,8 @@ Change Log
 
 <h2>Version 1.4.193 Beta (2016-10-31)</h2>
 <ul>
+<li>PR #386: Add JSR-310 Support (introduces JTS dependency fixed in 1.4.194)
+</li>
 <li>WARNING: THE MERGE BELOW WILL AFFECT ANY 'TIMESTAMP WITH TIMEZONE' INDEXES. You will need to drop and recreate any such indexes.
 </li>
 <li>PR #364: fix compare TIMESTAMP WITH TIMEZONE

h2/src/main/org/h2/jdbc/JdbcResultSet.java

@@ -1184,7 +1184,7 @@ public class JdbcResultSet extends TraceObject implements ResultSet, JdbcResultS
         try {
             int id = getNextId(TraceObject.ARRAY);
             if (isDebugEnabled()) {
-                debugCodeAssign("Clob", TraceObject.ARRAY, id, "getArray(" + columnIndex + ")");
+                debugCodeAssign("Array", TraceObject.ARRAY, id, "getArray(" + columnIndex + ")");
             }
             Value v = get(columnIndex);
             return v == ValueNull.INSTANCE ? null : new JdbcArray(conn, v, id);
@@ -1206,7 +1206,7 @@ public class JdbcResultSet extends TraceObject implements ResultSet, JdbcResultS
         try {
             int id = getNextId(TraceObject.ARRAY);
             if (isDebugEnabled()) {
-                debugCodeAssign("Clob", TraceObject.ARRAY, id, "getArray(" +
+                debugCodeAssign("Array", TraceObject.ARRAY, id, "getArray(" +
                                 quote(columnLabel) + ")");
             }
             Value v = get(columnLabel);