As part of a fix for HHH-5222, I changed LockMode.OPTIMISTIC + LockMode.OPTIMISTIC_FORCE_INCREMENT to be higher values than LockMode.READ. This helps the case where the user starts with a READ lock and later upgrades to LockMode.OPTIMISTIC_FORCE_INCREMENT. Previously, we would of only handled an upgrade from LockMode.OPTIMISTIC to LockMode.OPTIMISTIC_FORCE_INCREMENT. This test passes with mysql51 and postgresql84 matrix profiles. If it fails for other databases, we either need more locking primitives in that databases dialect or the database needs more features (we should exclude that dialect from the test). Scott