summaryrefslogtreecommitdiff
path: root/storage/rocksdb/rdb_datadic.cc
diff options
context:
space:
mode:
authorOleksandr Byelkin <sanja@mariadb.com>2022-01-27 08:45:36 +0100
committerOleksandr Byelkin <sanja@mariadb.com>2022-01-27 08:45:36 +0100
commit9b4a179d69a1c795bef303a88f9d3195669f00ec (patch)
tree87811d81af231e2945468ead0cba58cfc5514548 /storage/rocksdb/rdb_datadic.cc
parent020dc54dabe64f238e8ef4f50a630a22e0f06949 (diff)
parent7db489fc7dea2b4c236807035e57f169074c6682 (diff)
downloadmariadb-git-10.3-merge.tar.gz
Merge branch '10.2' into bb-10.3-release10.3-merge
Diffstat (limited to 'storage/rocksdb/rdb_datadic.cc')
-rw-r--r--storage/rocksdb/rdb_datadic.cc6
1 files changed, 6 insertions, 0 deletions
diff --git a/storage/rocksdb/rdb_datadic.cc b/storage/rocksdb/rdb_datadic.cc
index 3f9417385fe..3453cb0064e 100644
--- a/storage/rocksdb/rdb_datadic.cc
+++ b/storage/rocksdb/rdb_datadic.cc
@@ -5260,6 +5260,12 @@ void Rdb_dict_manager::log_start_drop_index(GL_INDEX_ID gl_index_id,
"from index id (%u,%u). MyRocks data dictionary may "
"get corrupted.",
gl_index_id.cf_id, gl_index_id.index_id);
+ if (rocksdb_ignore_datadic_errors)
+ {
+ sql_print_error("RocksDB: rocksdb_ignore_datadic_errors=1, "
+ "trying to continue");
+ return;
+ }
abort();
}
}