Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
a0631e72
Commit
a0631e72
authored
Sep 06, 2018
by
Vladislav Vaintroub
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MDEV-17149 mariabackup hangs if innodb is not started
Fix exit condition for the log copying thread.
parent
67b87e1d
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
24 additions
and
1 deletion
+24
-1
extra/mariabackup/xtrabackup.cc
extra/mariabackup/xtrabackup.cc
+1
-1
mysql-test/suite/mariabackup/skip_innodb.opt
mysql-test/suite/mariabackup/skip_innodb.opt
+1
-0
mysql-test/suite/mariabackup/skip_innodb.result
mysql-test/suite/mariabackup/skip_innodb.result
+10
-0
mysql-test/suite/mariabackup/skip_innodb.test
mysql-test/suite/mariabackup/skip_innodb.test
+12
-0
No files found.
extra/mariabackup/xtrabackup.cc
View file @
a0631e72
...
...
@@ -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
;
...
...
mysql-test/suite/mariabackup/skip_innodb.opt
0 → 100644
View file @
a0631e72
--loose-skip-innodb
\ No newline at end of file
mysql-test/suite/mariabackup/skip_innodb.result
0 → 100644
View file @
a0631e72
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;
mysql-test/suite/mariabackup/skip_innodb.test
0 → 100644
View file @
a0631e72
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
;
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment