diff options
| author | unknown <heikki@hundin.mysql.fi> | 2005-09-03 12:48:41 +0300 |
|---|---|---|
| committer | unknown <heikki@hundin.mysql.fi> | 2005-09-03 12:48:41 +0300 |
| commit | 80ea9db87bdef050f319a9a30e8a213bb099b451 (patch) | |
| tree | f1cfc841e48d7ec7336b21de057ad272c5bad540 /innobase | |
| parent | cf4a47c00cd52bab357e4de1bcd1ae30026a45bb (diff) | |
| download | mariadb-git-80ea9db87bdef050f319a9a30e8a213bb099b451.tar.gz | |
row0sel.c:
Fix a wrong debug assert in the previous patch
innobase/row/row0sel.c:
Fix a wrong debug assert in the previous patch
Diffstat (limited to 'innobase')
| -rw-r--r-- | innobase/row/row0sel.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/innobase/row/row0sel.c b/innobase/row/row0sel.c index de66e6a6219..1b66f14f5d7 100644 --- a/innobase/row/row0sel.c +++ b/innobase/row/row0sel.c @@ -3818,9 +3818,7 @@ no_gap_lock: 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 @@ requires_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 { /* We used 'offsets' for the clust rec, recalculate them for 'rec' */ |