diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-09-06 15:32:56 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-09-06 15:32:56 +0300 |
| commit | cd694d76ce8dfcf22c685000b40fd90eae58e396 (patch) | |
| tree | b9800bec3859b0eff3c224b68258216b068e689e /storage/innobase/fil/fil0crypt.cc | |
| parent | 17589989eec9cf4e9f7084505710a42929efe115 (diff) | |
| parent | 6b45355e6bd70e77fcd4dd4d0ef74608bafc9b02 (diff) | |
| download | mariadb-git-cd694d76ce8dfcf22c685000b40fd90eae58e396.tar.gz | |
Merge 10.0 into 10.1
Diffstat (limited to 'storage/innobase/fil/fil0crypt.cc')
| -rw-r--r-- | storage/innobase/fil/fil0crypt.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/storage/innobase/fil/fil0crypt.cc b/storage/innobase/fil/fil0crypt.cc index 25966e17e75..3095503cfc5 100644 --- a/storage/innobase/fil/fil0crypt.cc +++ b/storage/innobase/fil/fil0crypt.cc @@ -742,11 +742,12 @@ fil_space_encrypt( fprintf(stderr, "ok %d corrupted %d corrupted1 %d err %d different %d\n", ok , corrupted, corrupted1, err, different); fprintf(stderr, "src_frame\n"); - buf_page_print(src_frame, zip_size, BUF_PAGE_PRINT_NO_CRASH); + buf_page_print(src_frame, zip_size); fprintf(stderr, "encrypted_frame\n"); - buf_page_print(tmp, zip_size, BUF_PAGE_PRINT_NO_CRASH); + buf_page_print(tmp, zip_size); fprintf(stderr, "decrypted_frame\n"); - buf_page_print(tmp_mem, zip_size, 0); + buf_page_print(tmp_mem, zip_size); + ut_ad(0); } free(tmp_mem); |