Commit 80ea9db8 authored by unknown's avatar unknown

row0sel.c:

  Fix a wrong debug assert in the previous patch


innobase/row/row0sel.c:
  Fix a wrong debug assert in the previous patch
parent cf4a47c0
...@@ -3818,9 +3818,7 @@ no_gap_lock: ...@@ -3818,9 +3818,7 @@ no_gap_lock:
if (UNIV_UNLIKELY(rec_get_deleted_flag(rec, comp))) { if (UNIV_UNLIKELY(rec_get_deleted_flag(rec, comp))) {
/* The record is delete-marked: we can skip it if this is /* The record is delete-marked: we can skip it */
not a consistent read which might see an earlier version
of a non-clustered index record */
if (srv_locks_unsafe_for_binlog if (srv_locks_unsafe_for_binlog
&& prebuilt->select_lock_type != LOCK_NONE) { && prebuilt->select_lock_type != LOCK_NONE) {
...@@ -3895,7 +3893,8 @@ requires_clust_rec: ...@@ -3895,7 +3893,8 @@ requires_clust_rec:
result_rec = clust_rec; result_rec = clust_rec;
ut_ad(rec_offs_validate(rec, clust_index, offsets)); ut_ad(rec_offs_validate(result_rec, clust_index,
offsets));
} else { } else {
/* We used 'offsets' for the clust rec, recalculate /* We used 'offsets' for the clust rec, recalculate
them for 'rec' */ them for 'rec' */
......
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