summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2017-03-03 14:43:45 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2017-03-03 14:43:45 +0200
commit545f49dac361aa80aea26625233f9856ef4e16f5 (patch)
tree6375fe59569c9f62d02f1a54a44577fa60a61c2f
parentab8199f38e8f271139ac14ac704324cc1df541ce (diff)
downloadmariadb-git-545f49dac361aa80aea26625233f9856ef4e16f5.tar.gz
MDEV-12103: Move a misplaced assertion.
-rw-r--r--storage/innobase/log/log0recv.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/storage/innobase/log/log0recv.cc b/storage/innobase/log/log0recv.cc
index e3275f80e20..4c1e0854988 100644
--- a/storage/innobase/log/log0recv.cc
+++ b/storage/innobase/log/log0recv.cc
@@ -3073,7 +3073,6 @@ recv_init_crash_recovery_spaces(void)
for (recv_spaces_t::iterator i = recv_spaces.begin();
i != recv_spaces.end(); i++) {
ut_ad(!is_predefined_tablespace(i->first));
- ut_ad(i->second.deleted || i->second.name != "");
ut_ad(!i->second.deleted || !i->second.space);
if (i->second.deleted) {
@@ -3095,6 +3094,8 @@ recv_init_crash_recovery_spaces(void)
missing_spaces.insert(i->first);
flag_deleted = true;
}
+
+ ut_ad(i->second.deleted || i->second.name != "");
}
if (flag_deleted) {