Skip to content

Commit 4e07fc0

Browse files
committed
test failure
use --defaults-file to avoid reading ~/.my.cnf and don't crash if some ibdata file couldn't be opened
1 parent e8bc838 commit 4e07fc0

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

extra/mariabackup/backup_copy.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -977,7 +977,7 @@ copy_file(ds_ctxt_t *datasink,
977977
const char*action;
978978

979979
if (!datafile_open(src_file_path, &cursor, thread_n)) {
980-
goto error;
980+
goto error_close;
981981
}
982982

983983
strncpy(dst_name, cursor.rel_path, sizeof(dst_name));

mysql-test/suite/mariabackup/include/restart_and_restore.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ shutdown_server;
77
echo # remove datadir;
88
rmdir $_datadir;
99
echo # xtrabackup move back;
10-
exec $XTRABACKUP --copy-back --datadir=$_datadir --target-dir=$targetdir --parallel=2;
10+
exec $XTRABACKUP --defaults-file=$MYSQLTEST_VARDIR/my.cnf --copy-back --datadir=$_datadir --target-dir=$targetdir --parallel=2;
1111
echo # restart server;
1212
exec echo "restart" > $_expect_file_name;
1313
enable_reconnect;

0 commit comments

Comments
 (0)