Merge 10.4 into 10.5

This commit is contained in:
Marko Mäkelä 2020-05-20 17:46:05 +03:00
commit 5ece2155cb
37 changed files with 470 additions and 316 deletions

View file

@ -5535,7 +5535,7 @@ static bool xtrabackup_prepare_func(char** argv)
error_cleanup:
xb_filters_free();
return ok;
return ok && !ib::error::was_logged();
}
/**************************************************************************