1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

test failure

Browse Source 
use --defaults-file to avoid reading ~/.my.cnf
and don't crash if some ibdata file couldn't be opened
This commit is contained in:
Sergei Golubchik 2017-04-21 00:50:53 +02:00
parent e8bc838eb9
commit 4e07fc0ab5
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extra/mariabackup/backup_copy.cc
View File

@ -977,7 +977,7 @@ copy_file(ds_ctxt_t *datasink,
const char *action; const char *action;
if (!datafile_open(src_file_path, &cursor, thread_n)) { if (!datafile_open(src_file_path, &cursor, thread_n)) {
goto error; goto error_close;
} }
strncpy(dst_name, cursor.rel_path, sizeof(dst_name)); strncpy(dst_name, cursor.rel_path, sizeof(dst_name));

2
mysql-test/suite/mariabackup/include/restart_and_restore.inc
View File

@ -7,7 +7,7 @@ shutdown_server;
echo # remove datadir; echo # remove datadir;
rmdir $_datadir; rmdir $_datadir;
echo # xtrabackup move back; 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; echo # restart server;
exec echo "restart" > $_expect_file_name; exec echo "restart" > $_expect_file_name;
enable_reconnect; enable_reconnect;