diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-05-05 10:25:29 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-05-05 10:38:53 +0300 |
commit | f9cc391863ab962e8c8a8a8a676d730498eb8d6f (patch) | |
tree | a602f36756fafd5ec7ab856563689f9e1a50a8f2 /mysql-test/std_data | |
parent | db0917f68f2681882974afd53935aa8cba29c6b8 (diff) | |
parent | 765a43605a42c069ede604826ede2d93d72c4fdd (diff) | |
download | mariadb-git-f9cc391863ab962e8c8a8a8a676d730498eb8d6f.tar.gz |
Merge 10.1 into 10.2
This only merges MDEV-12253, adapting it to MDEV-12602 which is already
present in 10.2 but not yet in the 10.1 revision that is being merged.
TODO: Error handling in crash recovery needs to be improved.
If a page cannot be decrypted (or read), we should cleanly abort
the startup. If innodb_force_recovery is specified, we should
ignore the problematic page and apply redo log to other pages.
Currently, the test encryption.innodb-redo-badkey randomly fails
like this (the last messages are from cmake -DWITH_ASAN):
2017-05-05 10:19:40 140037071685504 [Note] InnoDB: Starting crash recovery from checkpoint LSN=1635994
2017-05-05 10:19:40 140037071685504 [ERROR] InnoDB: Missing MLOG_FILE_NAME or MLOG_FILE_DELETE before MLOG_CHECKPOINT for tablespace 1
2017-05-05 10:19:40 140037071685504 [ERROR] InnoDB: Plugin initialization aborted at srv0start.cc[2201] with error Data structure corruption
2017-05-05 10:19:41 140037071685504 [Note] InnoDB: Starting shutdown...
i=================================================================
==5226==ERROR: AddressSanitizer: attempting free on address which was not malloc()-ed: 0x612000018588 in thread T0
#0 0x736750 in operator delete(void*) (/mariadb/server/build/sql/mysqld+0x736750)
#1 0x1e4833f in LatchCounter::~LatchCounter() /mariadb/server/storage/innobase/include/sync0types.h:599:4
#2 0x1e480b8 in LatchMeta<LatchCounter>::~LatchMeta() /mariadb/server/storage/innobase/include/sync0types.h:786:17
#3 0x1e35509 in sync_latch_meta_destroy() /mariadb/server/storage/innobase/sync/sync0debug.cc:1622:3
#4 0x1e35314 in sync_check_close() /mariadb/server/storage/innobase/sync/sync0debug.cc:1839:2
#5 0x1dfdc18 in innodb_shutdown() /mariadb/server/storage/innobase/srv/srv0start.cc:2888:2
#6 0x197e5e6 in innobase_init(void*) /mariadb/server/storage/innobase/handler/ha_innodb.cc:4475:3
Diffstat (limited to 'mysql-test/std_data')
-rw-r--r-- | mysql-test/std_data/keys.txt | 2 | ||||
-rw-r--r-- | mysql-test/std_data/keys2.txt | 3 | ||||
-rw-r--r-- | mysql-test/std_data/keys3.txt | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/mysql-test/std_data/keys.txt b/mysql-test/std_data/keys.txt index e511521d7ab..2d83b7fba60 100644 --- a/mysql-test/std_data/keys.txt +++ b/mysql-test/std_data/keys.txt @@ -9,4 +9,4 @@ 5;966050D7777350B6FD5CCB3E5F648DA45C63BEFB6DEDDFA13443F156B7D35C84 6;B5EA210C8C09EF20DB95EC584714A89F # and yet another - +10;770A8A65DA156D24EE2A093277530143 diff --git a/mysql-test/std_data/keys2.txt b/mysql-test/std_data/keys2.txt index 5b98fbeebd2..93fc537cd3e 100644 --- a/mysql-test/std_data/keys2.txt +++ b/mysql-test/std_data/keys2.txt @@ -1,7 +1,8 @@ -1;593E580927F47AB530D3B1237CDEF6D6 +1;770A8A65DA156D24EE2A093277530142 2;352E42F1B9DB5CB915C3262FE745520A 3;CFE065600F5EB57481075C65180C3F8A 4;205379930183490D3BECA139BDF4DB5B 5;E2D944D5D837A1DCB22FF7FD397892EE 6;BAFE99B0BB87F2CD33A6AF26A11F6BD1 19;678D6B0063824BACCE33224B385104B35F30FF5749F0EBC030A0955DBC7FAC34 +20;BAFE99B0BB87F2CD33A6AF26A11F6BD1 diff --git a/mysql-test/std_data/keys3.txt b/mysql-test/std_data/keys3.txt index 4f6c618d2ad..be30acc6add 100644 --- a/mysql-test/std_data/keys3.txt +++ b/mysql-test/std_data/keys3.txt @@ -1,4 +1,4 @@ -1;593E580927F47AB530D3B1237CDEF6D6 +1;770A8A65DA156D24EE2A093277530142 2;E4B00A45BF775B4E07D634EC5CA5912B 3;6E35ACB162B29D1FB9E178021DAF16ED 4;971A664A88EE0022D408E40BFAB17E79 |