mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-18 13:02:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

InnoDB: After review fixes

Browse source
This commit is contained in:
marko@hundin.mysql.fi 2005-06-16 16:59:49 +03:00
parent f11bbee74f
commit a5025b8ebe
2 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
innobase/include/page0page.ic
View file

@ -597,7 +597,7 @@ page_rec_set_next(
if (next) { if (next) {
ut_ad(!page_rec_is_infimum(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); offs = (ulint) (next - page);
} else { } else {
offs = 0; offs = 0;
@ -624,7 +624,7 @@ page_rec_get_prev(
ut_ad(page_rec_check(rec)); 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)); ut_ad(!page_rec_is_infimum(rec));

14
innobase/lock/lock0lock.c
View file

@ -1304,16 +1304,10 @@ lock_rec_get_first(
lock = lock_rec_get_first_on_page(rec); lock = lock_rec_get_first_on_page(rec);
if (UNIV_LIKELY_NULL(lock)) { if (UNIV_LIKELY_NULL(lock)) {
if (page_rec_is_comp(rec)) { ulint heap_no = rec_get_heap_no(rec, page_rec_is_comp(rec));
while (lock && !lock_rec_get_nth_bit(lock,
rec_get_heap_no(rec, TRUE))) { while (lock && !lock_rec_get_nth_bit(lock, heap_no)) {
lock = lock_rec_get_next_on_page(lock); 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);
}
} }
} }