MDEV-21174: Replace mlog_write_string() with mtr_t::memcpy()

mtr_t::memcpy(): Replaces mlog_write_string(), mlog_log_string().
The buf_block_t is passed a parameter, so that
mlog_write_initial_log_record_low() can be used instead of
mlog_write_initial_log_record_fast().

fil_space_crypt_t::write_page0(): Remove the fil_space_t* parameter.

2 files changed, 16 insertions, 23 deletions

diff --git a/storage/innobase/btr/btr0btr.cc b/storage/innobase/btr/btr0btr.cc
index 01c28f6c88f..aa785fa2abd 100644
--- a/storage/innobase/btr/btr0btr.cc
+++ b/storage/innobase/btr/btr0btr.cc
@@ -1627,15 +1627,11 @@ func_exit:
 					    mach_read_from_2(instant));
 		if (!index->table->instant) {
 		} else if (page_is_comp(block->frame)) {
-			mlog_log_string(PAGE_NEW_INFIMUM + block->frame, 8,
-					mtr);
-			mlog_log_string(PAGE_NEW_SUPREMUM + block->frame, 8,
-					mtr);
+			mtr->memcpy(*block, PAGE_NEW_INFIMUM, 8);
+			mtr->memcpy(*block, PAGE_NEW_SUPREMUM, 8);
 		} else {
-			mlog_log_string(PAGE_OLD_INFIMUM + block->frame, 8,
-					mtr);
-			mlog_log_string(PAGE_OLD_SUPREMUM + block->frame, 8,
-					mtr);
+			mtr->memcpy(*block, PAGE_OLD_INFIMUM, 8);
+			mtr->memcpy(*block, PAGE_OLD_SUPREMUM, 8);
 		}
 	}
 
diff --git a/storage/innobase/btr/btr0cur.cc b/storage/innobase/btr/btr0cur.cc
index d6fc8ef28d0..932072ad182 100644
--- a/storage/innobase/btr/btr0cur.cc
+++ b/storage/innobase/btr/btr0cur.cc
@@ -7723,7 +7723,7 @@ btr_store_big_rec_extern_fields(
 				be made simpler.  Before InnoDB Plugin
 				1.0.4, the initialization of
 				FIL_PAGE_TYPE was logged as part of
-				the mlog_log_string() below. */
+				the mtr_t::memcpy() below. */
 
 				mtr.write<2>(*block,
 					     block->frame + FIL_PAGE_TYPE,
@@ -7770,12 +7770,11 @@ btr_store_big_rec_extern_fields(
 				mtr.write<4>(*block, block->frame
 					     + FIL_PAGE_FILE_FLUSH_LSN_OR_KEY_VERSION + 4,
 					     rec_page_no);
-				mlog_log_string(block->frame
-						+ FIL_PAGE_FILE_FLUSH_LSN_OR_KEY_VERSION,
-						page_zip_get_size(page_zip)
-						- FIL_PAGE_FILE_FLUSH_LSN_OR_KEY_VERSION
-						- c_stream.avail_out,
-						&mtr);
+				mtr.memcpy(*block,
+					   FIL_PAGE_FILE_FLUSH_LSN_OR_KEY_VERSION,
+					   page_zip_get_size(page_zip)
+					   - FIL_PAGE_FILE_FLUSH_LSN_OR_KEY_VERSION
+					   - c_stream.avail_out);
 				/* Zero out the unused part of the page. */
 				if (c_stream.avail_out) {
 					mtr.memset(block,
@@ -7852,14 +7851,12 @@ next_zip_page:
 					store_len = extern_len;
 				}
 
-				mlog_write_string(FIL_PAGE_DATA
-						  + BTR_BLOB_HDR_SIZE
-						  + block->frame,
-						  (const byte*)
-						  big_rec_vec->fields[i].data
-						  + big_rec_vec->fields[i].len
-						  - extern_len,
-						  store_len, &mtr);
+				mtr.memcpy(block,
+					   FIL_PAGE_DATA + BTR_BLOB_HDR_SIZE,
+					   (const byte*)
+					   big_rec_vec->fields[i].data
+					   + big_rec_vec->fields[i].len
+					   - extern_len, store_len);
 				mtr.write<4>(*block, BTR_BLOB_HDR_PART_LEN
 					     + FIL_PAGE_DATA + block->frame,
 					     store_len);