Commit dd352910 authored by jan's avatar jan

Port r375 from branches/5.0: Fix bug #15650 additional error InnoDB:

Error: unlock row could not find a 0 mode lock on the record.
parent 1bd22ab3
...@@ -3873,6 +3873,13 @@ ha_innobase::unlock_row(void) ...@@ -3873,6 +3873,13 @@ ha_innobase::unlock_row(void)
ut_error; ut_error;
} }
/* Consistent read does not take any locks, thus there is
nothing to unlock. */
if (prebuilt->select_lock_type == LOCK_NONE) {
DBUG_VOID_RETURN;
}
switch (prebuilt->row_read_type) { switch (prebuilt->row_read_type) {
case ROW_READ_WITH_LOCKS: case ROW_READ_WITH_LOCKS:
if (!srv_locks_unsafe_for_binlog if (!srv_locks_unsafe_for_binlog
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment