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
72407e54
Commit
72407e54
authored
Oct 23, 2017
by
Vladislav Vaintroub
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MDEV-13496 Use "mariabackup" rather than "xtrabackup" in console output
parent
125ce6f8
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
158 additions
and
164 deletions
+158
-164
extra/mariabackup/changed_page_bitmap.cc
extra/mariabackup/changed_page_bitmap.cc
+4
-4
extra/mariabackup/wsrep.cc
extra/mariabackup/wsrep.cc
+3
-3
extra/mariabackup/xtrabackup.cc
extra/mariabackup/xtrabackup.cc
+151
-157
No files found.
extra/mariabackup/changed_page_bitmap.cc
View file @
72407e54
...
...
@@ -538,7 +538,7 @@ xb_msg_missing_lsn_data(
lsn_t
missing_interval_start
,
/*!<in: interval start */
lsn_t
missing_interval_end
)
/*!<in: interval end */
{
msg
(
"
xtr
abackup: warning: changed page data missing for LSNs between "
msg
(
"
mari
abackup: warning: changed page data missing for LSNs between "
LSN_PF
" and "
LSN_PF
"
\n
"
,
missing_interval_start
,
missing_interval_end
);
}
...
...
@@ -615,7 +615,7 @@ xb_page_bitmap_init(void)
if
(
UNIV_UNLIKELY
(
bmp_start_lsn
>
bmp_end_lsn
))
{
msg
(
"
xtr
abackup: incremental backup LSN "
LSN_PF
msg
(
"
mari
abackup: incremental backup LSN "
LSN_PF
" is larger than than the last checkpoint LSN "
LSN_PF
"
\n
"
,
bmp_start_lsn
,
bmp_end_lsn
);
return
NULL
;
...
...
@@ -700,7 +700,7 @@ xb_page_bitmap_init(void)
&
current_page_end_lsn
,
bmp_start_lsn
)))
{
msg
(
"
xtr
abackup: Warning: changed page bitmap file "
msg
(
"
mari
abackup: Warning: changed page bitmap file "
"
\'
%s
\'
corrupted
\n
"
,
bitmap_file
.
name
);
rbt_free
(
result
);
free
(
bitmap_files
.
files
);
...
...
@@ -805,7 +805,7 @@ xb_page_bitmap_init(void)
if
(
UNIV_UNLIKELY
(
!
last_page_ok
))
{
msg
(
"
xtr
abackup: warning: changed page bitmap file "
msg
(
"
mari
abackup: warning: changed page bitmap file "
"
\'
%s
\'
corrupted.
\n
"
,
bitmap_file
.
name
);
rbt_free
(
result
);
free
(
bitmap_files
.
files
);
...
...
extra/mariabackup/wsrep.cc
View file @
72407e54
...
...
@@ -195,7 +195,7 @@ xb_write_galera_info(bool incremental_prepare)
fp
=
fopen
(
XB_GALERA_INFO_FILENAME
,
"w"
);
if
(
fp
==
NULL
)
{
msg
(
"
xtr
abackup: error: "
msg
(
"
mari
abackup: error: "
"could not create "
XB_GALERA_INFO_FILENAME
", errno = %d
\n
"
,
errno
);
...
...
@@ -204,12 +204,12 @@ xb_write_galera_info(bool incremental_prepare)
seqno
=
wsrep_xid_seqno
(
&
xid
);
msg
(
"
xtr
abackup: Recovered WSREP position: %s:%lld
\n
"
,
msg
(
"
mari
abackup: Recovered WSREP position: %s:%lld
\n
"
,
uuid_str
,
(
long
long
)
seqno
);
if
(
fprintf
(
fp
,
"%s:%lld"
,
uuid_str
,
(
long
long
)
seqno
)
<
0
)
{
msg
(
"
xtr
abackup: error: "
msg
(
"
mari
abackup: error: "
"could not write to "
XB_GALERA_INFO_FILENAME
", errno = %d
\n
"
,
errno
);
...
...
extra/mariabackup/xtrabackup.cc
View file @
72407e54
This diff is collapsed.
Click to expand it.
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