InnoDB: After review fixes

innobase/include/page0page.ic

@@ -597,7 +597,7 @@ page_rec_set_next(
 
 	if (next) {
 		ut_ad(!page_rec_is_infimum(next));
-		ut_a(page == ut_align_down(next, UNIV_PAGE_SIZE));
+		ut_ad(page == ut_align_down(next, UNIV_PAGE_SIZE));
 		offs = (ulint) (next - page);
 	} else {
 		offs = 0;
@@ -624,7 +624,7 @@ page_rec_get_prev(
 
 	ut_ad(page_rec_check(rec));	
 
-	page = buf_frame_align(rec);
+	page = ut_align_down(rec, UNIV_PAGE_SIZE);
 
 	ut_ad(!page_rec_is_infimum(rec));
 

innobase/lock/lock0lock.c

@@ -1304,16 +1304,10 @@ lock_rec_get_first(
 
 	lock = lock_rec_get_first_on_page(rec);
 	if (UNIV_LIKELY_NULL(lock)) {
-		if (page_rec_is_comp(rec)) {
-			while (lock && !lock_rec_get_nth_bit(lock,
-					rec_get_heap_no(rec, TRUE))) {
-				lock = lock_rec_get_next_on_page(lock);
-			}
-		} else {
-			while (lock && !lock_rec_get_nth_bit(lock,
-					rec_get_heap_no(rec, FALSE))) {
-				lock = lock_rec_get_next_on_page(lock);
-			}
+		ulint	heap_no = rec_get_heap_no(rec, page_rec_is_comp(rec));
+
+		while (lock && !lock_rec_get_nth_bit(lock, heap_no)) {
+			lock = lock_rec_get_next_on_page(lock);
 		}
 	}