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
12f90022
Commit
12f90022
authored
Jan 16, 2018
by
Daniel Black
Committed by
Vladislav Vaintroub
Jan 23, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mariadbbackup: use defaults-group-suffix even if no --defaults-file
Signed-off-by:
Daniel Black
<
daniel@linux.vnet.ibm.com
>
parent
7cc507f2
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
3 deletions
+4
-3
extra/mariabackup/xtrabackup.cc
extra/mariabackup/xtrabackup.cc
+4
-3
No files found.
extra/mariabackup/xtrabackup.cc
View file @
12f90022
...
...
@@ -1223,8 +1223,8 @@ static int prepare_export()
if
(
strncmp
(
orig_argv1
,
"--defaults-file="
,
16
)
==
0
)
{
sprintf
(
cmdline
,
IF_WIN
(
"
\"
"
,
""
)
"
\"
%s
\"
--mysqld
\"
%s
\"
--defaults-group-suffix=%s
"
" --defaults-extra-file=./backup-my.cnf --datadir=."
IF_WIN
(
"
\"
"
,
""
)
"
\"
%s
\"
--mysqld
\"
%s
\"
"
" --defaults-extra-file=./backup-my.cnf --d
efaults-group-suffix=%s --d
atadir=."
" --innodb --innodb-fast-shutdown=0"
" --innodb_purge_rseg_truncate_frequency=1 --innodb-buffer-pool-size=%llu"
" --console --skip-log-error --bootstrap < "
BOOTSTRAP_FILENAME
IF_WIN
(
"
\"
"
,
""
),
...
...
@@ -1236,11 +1236,12 @@ static int prepare_export()
{
sprintf
(
cmdline
,
IF_WIN
(
"
\"
"
,
""
)
"
\"
%s
\"
--mysqld"
" --defaults-file=./backup-my.cnf --datadir=."
" --defaults-file=./backup-my.cnf --d
efaults-group-suffix=%s --d
atadir=."
" --innodb --innodb-fast-shutdown=0"
" --innodb_purge_rseg_truncate_frequency=1 --innodb-buffer-pool-size=%llu"
" --console --log-error= --bootstrap < "
BOOTSTRAP_FILENAME
IF_WIN
(
"
\"
"
,
""
),
mariabackup_exe
,
(
my_defaults_group_suffix
?
my_defaults_group_suffix
:
""
),
xtrabackup_use_memory
);
}
...
...
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