Remove some noise from ib::fatal() and ib::fatal_or_error()

Avoid the redundant output from ut_dbg_assertion_failed by directly invoking abort().
MariaDB · May 26, 2017 · e54d521 · e54d521
1 parent 2fd8400
commit e54d521
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/storage/innobase/ut/ut0ut.cc b/storage/innobase/ut/ut0ut.cc
@@ -837,7 +837,7 @@ error::~error()
 fatal::~fatal()
 {
 	sql_print_error("[FATAL] InnoDB: %s", m_oss.str().c_str());
-	ut_error;
+	abort();
 }
 
 error_or_warn::~error_or_warn()
@@ -851,8 +851,11 @@ error_or_warn::~error_or_warn()
 
 fatal_or_error::~fatal_or_error()
 {
-	sql_print_error("InnoDB: %s", m_oss.str().c_str());
-	ut_a(!m_fatal);
+	sql_print_error(m_fatal ? "[FATAL] InnoDB: %s" : "InnoDB: %s",
+			m_oss.str().c_str());
+	if (m_fatal) {
+		abort();
+	}
 }
 
 } // namespace ib