diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-05-26 19:13:21 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-05-26 19:13:21 +0300 |
| commit | 808f18c748a98dcc7df0b8154563153c8527d3f0 (patch) | |
| tree | 31a76a454ec9f2ac52cc195d8fbc52454507b2d6 /storage | |
| parent | 2f29fc3c1c4262919633ab53c80f195ec67a32e9 (diff) | |
| download | mariadb-git-808f18c748a98dcc7df0b8154563153c8527d3f0.tar.gz | |
MDEV-12926 encryption.innodb_onlinealter_encryption, encryption.innodb-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 65e1399e64a306f1ce1d920e66206954f8630da8
which included a commit to merge changes from MySQL 5.6.36 to
MariaDB Server 10.0.
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/innobase/row/row0merge.cc | 2 | ||||
| -rw-r--r-- | storage/xtradb/row/row0merge.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/storage/innobase/row/row0merge.cc b/storage/innobase/row/row0merge.cc index 85e053de961..45a8010d56d 100644 --- 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 index 16348f3c8dd..408e94b3997 100644 --- 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) { |