Documentation / formatting

h2/src/docsrc/html/changelog.html

@@ -17,12 +17,13 @@ Change Log
 <h1>Change Log</h1>
 
 <h2>Next Version (unreleased)</h2>
-<ul><li>MVStore: concurrent compaction and store operations could result in an IllegalStateException.
+<ul><li>Issue 587: MVStore: concurrent compaction and store operations could result in an IllegalStateException.
 </li><li>Issue 594: Profiler.copyInThread does not work properly.
-</li><li>Script tool: Fix parsing of BLOCKSIZE parameter, original patch by Ken Jorissen
+</li><li>Script tool: Now, SCRIPT ... TO is always used (for higher speed and lower disk space usage).
+</li><li>Script tool: Fix parsing of BLOCKSIZE parameter, original patch by Ken Jorissen.
 </li><li>Fix bug in PageStore#commit method - when the ignoreBigLog flag was set,
     the logic that cleared the flag could never be reached, resulting in performance degradation.
-    Reported by Alexander Nesterov.    
+    Reported by Alexander Nesterov.
 </li><li>Issue 552: Implement BIT_AND and BIT_OR aggregate functions
 </li></ul>
 

h2/src/main/org/h2/res/help.csv

@@ -822,6 +822,14 @@ A spatial geometry type, based on the ""com."
 AVG ( [ DISTINCT ] { numeric } )
 ","
 The average (mean) value."
+"Functions (Aggregate)","BIT_AND","
+BIT_AND(expression)
+","
+The bitwise AND of all non-null values."
+"Functions (Aggregate)","BIT_OR","
+BIT_OR(expression)
+","
+The bitwise OR of all non-null values."
 "Functions (Aggregate)","BOOL_AND","
 BOOL_AND(boolean)
 ","

h2/src/test/org/h2/test/store/TestConcurrent.java

@@ -49,7 +49,7 @@ public class TestConcurrent extends TestMVStore {
         FileUtils.deleteRecursive(getBaseDir(), true);
         FileUtils.createDirectories(getBaseDir());
         FileUtils.deleteRecursive("memFS:", false);
-        
+
         testConcurrentSaveCompact();
         testConcurrentDataType();
         testConcurrentAutoCommitAndChange();
@@ -65,7 +65,7 @@ public class TestConcurrent extends TestMVStore {
         testConcurrentWrite();
         testConcurrentRead();
     }
-    
+
     private void testConcurrentSaveCompact() throws Exception {
         String fileName = "memFS:testConcurrentSaveCompact";
         FileUtils.delete(fileName);

h2/src/test/org/h2/test/unit/TestTools.java

@@ -869,7 +869,7 @@ public class TestTools extends TestBase {
         tool.runTool("-url", url, "-user", user, "-password", password,
                 "-script", fileName + ".txt", "-showResults");
         assertTrue(buff.toString().contains("Hello"));
-        
+
 
         // test parsing of BLOCKSIZE option
         DeleteDbFiles.main("-dir", getBaseDir(), "-db", "testScriptRunscript",

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

@@ -767,4 +767,6 @@ permanently nucleus forbidden student trusted poodle agentlib
 jech ladislav cognitect sergey thompson evdokimov arykov mfulton
 dimitrijs fedotovs kingdom manley xso latvia ontwikkeling reeve
 extendable republic uniquely datasources accidentally recursing respecting
-young sweep clearer accounting disappeared donor oome
+young sweep clearer accounting disappeared donor oome ken jorissen nesterov
\ No newline at end of file
+
+degradation