Commit 4e07fc0a authored by Sergei Golubchik's avatar Sergei Golubchik

test failure

use --defaults-file to avoid reading ~/.my.cnf
and don't crash if some ibdata file couldn't be opened
parent e8bc838e
......@@ -977,7 +977,7 @@ copy_file(ds_ctxt_t *datasink,
const char *action;
if (!datafile_open(src_file_path, &cursor, thread_n)) {
goto error;
goto error_close;
}
strncpy(dst_name, cursor.rel_path, sizeof(dst_name));
......
......@@ -7,7 +7,7 @@ shutdown_server;
echo # remove datadir;
rmdir $_datadir;
echo # xtrabackup move back;
exec $XTRABACKUP --copy-back --datadir=$_datadir --target-dir=$targetdir --parallel=2;
exec $XTRABACKUP --defaults-file=$MYSQLTEST_VARDIR/my.cnf --copy-back --datadir=$_datadir --target-dir=$targetdir --parallel=2;
echo # restart server;
exec echo "restart" > $_expect_file_name;
enable_reconnect;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment