MDEV-12926 encryption.innodb_onlinealter_encryption, encryption.innod…

…b-bad-key-change failed in buildbot with valgrind row_merge_write(): Pass the correct (possibly encrypted) buffer to os_file_write_int_fd(). This bug was introduced in commit 65e1399 which included a commit to merge changes from MySQL 5.6.36 to MariaDB Server 10.0.
MariaDB · May 26, 2017 · 808f18c · 808f18c
1 parent 2f29fc3
commit 808f18c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/storage/innobase/row/row0merge.cc b/storage/innobase/row/row0merge.cc
@@ -1016,7 +1016,7 @@ row_merge_write(
 		mach_write_to_4((byte *)out_buf, 0);
 	}
 
-	ret = os_file_write_int_fd("(merge)", fd, buf, ofs, buf_len);
+	ret = os_file_write_int_fd("(merge)", fd, out_buf, ofs, buf_len);
 
 #ifdef UNIV_DEBUG
 	if (row_merge_print_block_write) {

diff --git a/storage/xtradb/row/row0merge.cc b/storage/xtradb/row/row0merge.cc
@@ -1023,7 +1023,7 @@ row_merge_write(
 		mach_write_to_4((byte *)out_buf, 0);
 	}
 
-	ret = os_file_write_int_fd("(merge)", fd, buf, ofs, buf_len);
+	ret = os_file_write_int_fd("(merge)", fd, out_buf, ofs, buf_len);
 
 #ifdef UNIV_DEBUG
 	if (row_merge_print_block_write) {