Documentation.

h2/src/docsrc/html/tutorial.html

@@ -913,7 +913,7 @@ public class TestCsv {
         rs.addColumn("EMAIL", Types.VARCHAR, 255, 0);
         rs.addRow("Bob Meier", "bob.meier@abcde.abc");
         rs.addRow("John Jones", "john.jones@abcde.abc");
-        Csv.getInstance().write("data/test.csv", rs, null);
+        new Csv().write("data/test.csv", rs, null);
     }
 }
 </pre>
@@ -928,8 +928,7 @@ import java.sql.*;
 import org.h2.tools.Csv;
 public class TestCsv {
     public static void main(String[] args) throws Exception {
-        ResultSet rs = Csv.getInstance().
-            read("data/test.csv", null, null);
+        ResultSet rs = new Csv().read("data/test.csv", null, null);
         ResultSetMetaData meta = rs.getMetaData();
         while (rs.next()) {
             for (int i = 0; i &lt; meta.getColumnCount(); i++) {

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

@@ -588,7 +588,6 @@ public class Select extends Query {
         topTableFilter.startQuery(session);
         topTableFilter.reset();
         boolean exclusive = isForUpdate && !isForUpdateMvcc;
-        topTableFilter.lock(session, exclusive, exclusive);
         if (isForUpdateMvcc) {
             if (isGroupQuery) {
                 throw DbException.getUnsupportedException("FOR UPDATE && GROUP");
@@ -602,6 +601,7 @@ public class Select extends Query {
                 throw DbException.getUnsupportedException("FOR UPDATE && JOIN");
             }
         }
+        topTableFilter.lock(session, exclusive, exclusive);
         ResultTarget to = result != null ? result : target;
         if (limitRows != 0) {
             if (isQuickAggregateQuery) {