summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
authorVladislav Vaintroub <wlad@mariadb.com>2019-04-23 12:44:09 +0100
committerVladislav Vaintroub <wlad@mariadb.com>2019-04-23 12:44:09 +0100
commit6b5d3c51b3d4260ba692bb84c64eb2705635e051 (patch)
tree652e4899aed41329d1d7da6dac85a2ebd5b94739 /extra
parentd315b4ff3903e665a6b2ad196dbe0f7feb57eed5 (diff)
downloadmariadb-git-6b5d3c51b3d4260ba692bb84c64eb2705635e051.tar.gz
Do fast exit with error code and FATAL ERROR message, if innodb cannot start during prepare.
Otherwise, it is possible for "prepare" to exit with error code 0, even if it did not work at all.
Diffstat (limited to 'extra')
-rw-r--r--extra/mariabackup/xtrabackup.cc4
1 files changed, 1 insertions, 3 deletions
diff --git a/extra/mariabackup/xtrabackup.cc b/extra/mariabackup/xtrabackup.cc
index 2b8abc04446..4b6ba960c05 100644
--- a/extra/mariabackup/xtrabackup.cc
+++ b/extra/mariabackup/xtrabackup.cc
@@ -1989,10 +1989,8 @@ static bool innodb_init()
{
dberr_t err = innobase_start_or_create_for_mysql();
if (err != DB_SUCCESS) {
- msg("mariabackup: innodb_init() returned %d (%s).",
+ die("mariabackup: innodb_init() returned %d (%s).",
err, ut_strerr(err));
- innodb_shutdown();
- return(TRUE);
}
return(FALSE);