Update changelog, fix a typo and a long line

h2/src/docsrc/html/changelog.html

@@ -21,6 +21,14 @@ Change Log
 
 <h2>Next Version (unreleased)</h2>
 <ul>
+<li>Issue #1549: [RFE] Implement locking modes (select for update)
+</li>
+<li>PR #1548: Add AsynchronousFileChannel-based experimental FilePathAsync
+</li>
+<li>PR #1547: Speedup unused chunks collection
+</li>
+<li>PR #1546: Tiny optimization: use `System.arraycopy` when possible
+</li>
 <li>PR #1545: Export datetime value functions to SQL using standard syntax
 </li>
 <li>Issue #1371: NPE in CacheLRU

h2/src/main/org/h2/api/ErrorCode.java

@@ -2040,7 +2040,7 @@ public class ErrorCode {
      * SELECT MAX(VALUE) FOR UPDATE;
      * </pre>
      */
-    public static final int FOR_UPDATE_IS_NOT_ALLOWED_IN_DISTICT_OR_GROUPED_SELECT = 90145;
+    public static final int FOR_UPDATE_IS_NOT_ALLOWED_IN_DISTINCT_OR_GROUPED_SELECT = 90145;
 
 
     // next is 90146

h2/src/main/org/h2/command/dml/Select.java

@@ -1465,7 +1465,7 @@ public class Select extends Query {
     @Override
     public void setForUpdate(boolean b) {
         if (b && (isAnyDistinct() || isGroupQuery)) {
-            throw DbException.get(ErrorCode.FOR_UPDATE_IS_NOT_ALLOWED_IN_DISTICT_OR_GROUPED_SELECT);
+            throw DbException.get(ErrorCode.FOR_UPDATE_IS_NOT_ALLOWED_IN_DISTINCT_OR_GROUPED_SELECT);
         }
         this.isForUpdate = b;
         if (session.getDatabase().isMVStore()) {

h2/src/main/org/h2/message/DbException.java

@@ -566,7 +566,7 @@ public class DbException extends RuntimeException {
         case CAN_ONLY_ASSIGN_TO_VARIABLE_1:
         case PUBLIC_STATIC_JAVA_METHOD_NOT_FOUND_1:
         case JAVA_OBJECT_SERIALIZER_CHANGE_WITH_DATA_TABLE:
-        case FOR_UPDATE_IS_NOT_ALLOWED_IN_DISTICT_OR_GROUPED_SELECT:
+        case FOR_UPDATE_IS_NOT_ALLOWED_IN_DISTINCT_OR_GROUPED_SELECT:
             return new JdbcSQLSyntaxErrorException(message, sql, state, errorCode, cause, stackTrace);
         case HEX_STRING_ODD_1:
         case HEX_STRING_WRONG_1:

h2/src/main/org/h2/mvstore/MVStore.java

@@ -1419,7 +1419,8 @@ public class MVStore {
                 Set<Long> inspectedRoots = new HashSet<>();
                 do {
                     inspectVersion(rootReference, collector, executorService, executingThreadCounter, inspectedRoots);
-                } while (rootReference.version >= oldestVersionToKeep && (rootReference = rootReference.previous) != null);
+                } while (rootReference.version >= oldestVersionToKeep
+                        && (rootReference = rootReference.previous) != null);
             }
             return collector.getReferenced();
         } finally {

h2/src/test/org/h2/test/scripts/dml/select.sql

@@ -423,19 +423,19 @@ SELECT ID, VALUE FROM TEST FOR UPDATE;
 > rows: 3
 
 SELECT DISTINCT VALUE FROM TEST FOR UPDATE;
-> exception FOR_UPDATE_IS_NOT_ALLOWED_IN_DISTICT_OR_GROUPED_SELECT
+> exception FOR_UPDATE_IS_NOT_ALLOWED_IN_DISTINCT_OR_GROUPED_SELECT
 
 SELECT DISTINCT ON(VALUE) ID, VALUE FROM TEST FOR UPDATE;
-> exception FOR_UPDATE_IS_NOT_ALLOWED_IN_DISTICT_OR_GROUPED_SELECT
+> exception FOR_UPDATE_IS_NOT_ALLOWED_IN_DISTINCT_OR_GROUPED_SELECT
 
 SELECT SUM(VALUE) FROM TEST FOR UPDATE;
-> exception FOR_UPDATE_IS_NOT_ALLOWED_IN_DISTICT_OR_GROUPED_SELECT
+> exception FOR_UPDATE_IS_NOT_ALLOWED_IN_DISTINCT_OR_GROUPED_SELECT
 
 SELECT ID FROM TEST GROUP BY VALUE FOR UPDATE;
-> exception FOR_UPDATE_IS_NOT_ALLOWED_IN_DISTICT_OR_GROUPED_SELECT
+> exception FOR_UPDATE_IS_NOT_ALLOWED_IN_DISTINCT_OR_GROUPED_SELECT
 
 SELECT 1 FROM TEST HAVING TRUE FOR UPDATE;
-> exception FOR_UPDATE_IS_NOT_ALLOWED_IN_DISTICT_OR_GROUPED_SELECT
+> exception FOR_UPDATE_IS_NOT_ALLOWED_IN_DISTINCT_OR_GROUPED_SELECT
 
 DROP TABLE TEST;
 > ok

h2/src/tools/org/h2/build/doc/dictionary.txt

@@ -801,4 +801,4 @@ partitioned tri partitions
 
 discard enhancements nolock surefire logarithm
 qualification opportunity jumping exploited unacceptable vrs duplicated
-queryparser tokenized freeze factorings recompilation unenclosed
+queryparser tokenized freeze factorings recompilation unenclosed rfe dsync