From 15d8cc6e64e24ce3bb810adfb934b4c90987f130 Mon Sep 17 00:00:00 2001 From: marko Date: Wed, 28 Nov 2007 13:09:50 +0000 Subject: [PATCH] branches/zip: row_vers_impl_x_locked_off_kernel(): In follow-up to r2119, assert ut_a(entry) instead of playing it safe. --- row/row0vers.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/row/row0vers.c b/row/row0vers.c index fd06065d974..fbb8b5737a9 100644 --- a/row/row0vers.c +++ b/row/row0vers.c @@ -171,10 +171,8 @@ row_vers_impl_x_locked_off_kernel( in place of a deleted record, and the BLOB pointers of the new record were not initialized yet. But in that case, - prev_version should be NULL. - - We will play it safe and avoid dereferencing - entry when it is NULL, later in this function. */ + prev_version should be NULL. */ + ut_a(entry); } mutex_enter(&kernel_mutex); @@ -209,7 +207,7 @@ row_vers_impl_x_locked_off_kernel( /* We check if entry and rec are identified in the alphabetical ordering */ - if (entry && 0 == cmp_dtuple_rec(entry, rec, offsets)) { + if (0 == cmp_dtuple_rec(entry, rec, offsets)) { /* The delete marks of rec and prev_version should be equal for rec to be in the state required by prev_version */