diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-06-15 14:35:51 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-06-15 14:35:51 +0300 |
| commit | 615b1f418944f2c1e3092eb89919a39dc11b365d (patch) | |
| tree | f32ce1eec037817b89ef3073663f01ff6de4d32f /storage/innobase/btr/btr0btr.cc | |
| parent | 72378a25830184f91005be7e80cfb28381c79f23 (diff) | |
| parent | 58f87a41bd8de7370cc05c41977fadc685826c9e (diff) | |
| download | mariadb-git-615b1f418944f2c1e3092eb89919a39dc11b365d.tar.gz | |
Merge 10.1 into 10.2
innodb.table_flags: Adjust the test case. Due to the MDEV-12873 fix
in 10.2, the corrupted flags for table test.td would be converted,
and a tablespace flag mismatch will occur when trying to open the file.
Diffstat (limited to 'storage/innobase/btr/btr0btr.cc')
| -rw-r--r-- | storage/innobase/btr/btr0btr.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/storage/innobase/btr/btr0btr.cc b/storage/innobase/btr/btr0btr.cc index d0fcd68c677..89ebe5b8783 100644 --- a/storage/innobase/btr/btr0btr.cc +++ b/storage/innobase/btr/btr0btr.cc @@ -171,7 +171,8 @@ btr_root_block_get( if (index && index->table) { index->table->file_unreadable = true; - ib_push_warning(index->table->thd, DB_DECRYPTION_FAILED, + ib_push_warning( + static_cast<THD*>(NULL), DB_DECRYPTION_FAILED, "Table %s in tablespace %lu is encrypted but encryption service or" " used key_id is not available. " " Can't continue reading table.", |