Percona-Server-5.6.15-rel63.0.tar.gz merge

1 files changed, 16 insertions, 13 deletions

diff --git a/storage/xtradb/mtr/mtr0mtr.cc b/storage/xtradb/mtr/mtr0mtr.cc
index 02e8cbdbfcc..a4877f175a1 100644
--- a/storage/xtradb/mtr/mtr0mtr.cc
+++ b/storage/xtradb/mtr/mtr0mtr.cc
@@ -171,26 +171,29 @@ mtr_memo_note_modifications(
 /*========================*/
 	mtr_t*	mtr)	/*!< in: mtr */
 {
-	dyn_array_t*	memo;
-	ulint		offset;
-
 	ut_ad(!srv_read_only_mode);
 	ut_ad(mtr->magic_n == MTR_MAGIC_N);
 	ut_ad(mtr->state == MTR_COMMITTING); /* Currently only used in
 					     commit */
-	memo = &mtr->memo;
-
-	offset = dyn_array_get_data_size(memo);
-
-	while (offset > 0) {
-		mtr_memo_slot_t* slot;
 
-		offset -= sizeof(mtr_memo_slot_t);
+	for (const dyn_block_t* block = dyn_array_get_last_block(&mtr->memo);
+	     block;
+	     block = dyn_array_get_prev_block(&mtr->memo, block)) {
+		const mtr_memo_slot_t*	start
+			= reinterpret_cast<mtr_memo_slot_t*>(
+				dyn_block_get_data(block));
+		mtr_memo_slot_t*	slot
+			= reinterpret_cast<mtr_memo_slot_t*>(
+				dyn_block_get_data(block)
+				+ dyn_block_get_used(block));
 
-		slot = static_cast<mtr_memo_slot_t*>(
-			dyn_array_get_element(memo, offset));
+		ut_ad(!(dyn_block_get_used(block) % sizeof(mtr_memo_slot_t)));
 
-		mtr_memo_slot_note_modification(mtr, slot);
+		while (slot-- != start) {
+			if (slot->object != NULL) {
+				mtr_memo_slot_note_modification(mtr, slot);
+			}
+		}
 	}
 }