Commit 80ea9db8 authored by unknown's avatar unknown
Browse files

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

innobase/row/row0sel.c

+3 −4
Original line number Diff line number Diff line
@@ -3818,9 +3818,7 @@ cursor lock count is done correctly. See bugs #12263 and #12456! 


	if (UNIV_UNLIKELY(rec_get_deleted_flag(rec, comp))) {



		/* The record is delete-marked: we can skip it if this is

		not a consistent read which might see an earlier version

		of a non-clustered index record */

		/* The record is delete-marked: we can skip it */



		if (srv_locks_unsafe_for_binlog

	    	    && prebuilt->select_lock_type != LOCK_NONE) {
@@ -3895,7 +3893,8 @@ cursor lock count is done correctly. See bugs #12263 and #12456! 


		        result_rec = clust_rec;



			ut_ad(rec_offs_validate(rec, clust_index, offsets));

			ut_ad(rec_offs_validate(result_rec, clust_index,

								offsets));

		} else {

			/* We used 'offsets' for the clust rec, recalculate

			them for 'rec' */