summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2021-11-15 15:20:25 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2021-11-15 15:20:25 +0200
commit993b45aff1c29924d471ff6230e8a7210ac548c0 (patch)
tree2026c0128d803c507ec9b7d1eba55a255ac35ef3
parentdcf15a9de11d5986e10ee48450dcf2f5585d9f38 (diff)
downloadmariadb-git-bb-10.6-marko.tar.gz
TODO: file a bug with test: Fix recovery after failed ADD UNIQUE INDEXbb-10.6-marko
-rw-r--r--storage/innobase/dict/dict0load.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/storage/innobase/dict/dict0load.cc b/storage/innobase/dict/dict0load.cc
index a69f645758f..69ace91d42a 100644
--- a/storage/innobase/dict/dict0load.cc
+++ b/storage/innobase/dict/dict0load.cc
@@ -1875,6 +1875,10 @@ dict_load_indexes(
}
if (err_msg == dict_load_index_del) {
+ if (rec[8 + 8 + DATA_TRX_ID_LEN + DATA_ROLL_PTR_LEN]
+ != static_cast<byte>(*TEMP_INDEX_PREFIX_STR)) {
+ goto next_rec;
+ }
const trx_id_t id = mach_read_from_6(rec + 8 + 8);
if (id > table->def_trx_id) {
table->def_trx_id = id;