database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

MDEV-17149 mariabackup hangs if innodb is not started

Browse Source 
Fix exit condition for the log copying thread.
This commit is contained in:
Vladislav Vaintroub
2018-09-06 15:31:29 +01:00
parent 67b87e1d76
commit a0631e7221
4 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
extra/mariabackup/xtrabackup.cc
View File

@@ -2718,7 +2718,7 @@ static os_thread_ret_t log_copying_thread(void*)
log_mutex_enter();
bool completed = metadata_to_lsn
&& metadata_to_lsn < log_copy_scanned_lsn;
&& metadata_to_lsn <= log_copy_scanned_lsn;
log_mutex_exit();
if (completed) {
break;

1
mysql-test/suite/mariabackup/skip_innodb.opt Normal file
View File

@@ -0,0 +1 @@
--loose-skip-innodb

10
mysql-test/suite/mariabackup/skip_innodb.result Normal file
View File

@@ -0,0 +1,10 @@
CREATE TABLE t(i int);
INSERT INTO t VALUES(1);
# shutdown server
# remove datadir
# xtrabackup move back
# restart server
SELECT * from t;
i
1
DROP TABLE t;

12
mysql-test/suite/mariabackup/skip_innodb.test Normal file
View File

@@ -0,0 +1,12 @@
let $targetdir=$MYSQLTEST_VARDIR/tmp/backup;
CREATE TABLE t(i int);
INSERT INTO t VALUES(1);
--disable_result_log
exec $XTRABACKUP --defaults-file=$MYSQLTEST_VARDIR/my.cnf --backup --target-dir=$targetdir;
exec $XTRABACKUP --prepare --target-dir=$targetdir;
-- source include/restart_and_restore.inc
--enable_result_log
SELECT * from t;
DROP TABLE t;
rmdir $targetdir;