Multi-version concurrency: SELECT ... FOR UPDATE threw a "concurrent update"…

Multi-version concurrency: SELECT ... FOR UPDATE threw a "concurrent update" exception immediately instead of a "lock timeout" exception after the set lock timeout if the row was already locked by another connection.

h2/src/test/org/h2/test/mvcc/TestMvcc2.java

@@ -161,7 +161,7 @@ public class TestMvcc2 extends TestBase {
             conn2.createStatement().execute("select * from test where id = 3 for update");
             fail();
         } catch (SQLException e) {
-            assertEquals(ErrorCode.CONCURRENT_UPDATE_1, e.getErrorCode());
+            assertEquals(ErrorCode.LOCK_TIMEOUT_1, e.getErrorCode());
         }
         conn.close();
     }