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
18e17f13
Commit
18e17f13
authored
Sep 08, 2017
by
Vladislav Vaintroub
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Windows : Fix MTR's misuse of servers --console parameter
parent
d471469b
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
18 deletions
+2
-18
extra/mariabackup/xtrabackup.cc
extra/mariabackup/xtrabackup.cc
+2
-3
mysql-test/mysql-test-run.pl
mysql-test/mysql-test-run.pl
+0
-15
No files found.
extra/mariabackup/xtrabackup.cc
View file @
18e17f13
...
@@ -1199,7 +1199,7 @@ static int prepare_export()
...
@@ -1199,7 +1199,7 @@ static int prepare_export()
" --defaults-extra-file=./backup-my.cnf --datadir=."
" --defaults-extra-file=./backup-my.cnf --datadir=."
" --innodb --innodb-fast-shutdown=0"
" --innodb --innodb-fast-shutdown=0"
" --innodb_purge_rseg_truncate_frequency=1 --innodb-buffer-pool-size=%llu"
" --innodb_purge_rseg_truncate_frequency=1 --innodb-buffer-pool-size=%llu"
" --console --
log-error=
--bootstrap < "
BOOTSTRAP_FILENAME
IF_WIN
(
"
\"
"
,
""
),
" --console --
skip-log-error
--bootstrap < "
BOOTSTRAP_FILENAME
IF_WIN
(
"
\"
"
,
""
),
mariabackup_exe
,
mariabackup_exe
,
orig_argv1
,
(
my_defaults_group_suffix
?
my_defaults_group_suffix
:
""
),
orig_argv1
,
(
my_defaults_group_suffix
?
my_defaults_group_suffix
:
""
),
xtrabackup_use_memory
);
xtrabackup_use_memory
);
...
@@ -1228,7 +1228,6 @@ static int prepare_export()
...
@@ -1228,7 +1228,6 @@ static int prepare_export()
fprintf
(
stderr
,
"%s"
,
outline
);
fprintf
(
stderr
,
"%s"
,
outline
);
err
=
pclose
(
outf
);
err
=
pclose
(
outf
);
end:
end:
unlink
(
BOOTSTRAP_FILENAME
);
unlink
(
BOOTSTRAP_FILENAME
);
return
err
;
return
err
;
...
@@ -5028,7 +5027,7 @@ handle_options(int argc, char **argv, char ***argv_client, char ***argv_server)
...
@@ -5028,7 +5027,7 @@ handle_options(int argc, char **argv, char ***argv_client, char ***argv_server)
my_sigset
(
SIGINT
,
SIG_DFL
);
my_sigset
(
SIGINT
,
SIG_DFL
);
#endif
#endif
sf_leaking_memory
=
0
;
/* don't report memory leaks on early exist */
sf_leaking_memory
=
1
;
/* don't report memory leaks on early exist */
int
i
;
int
i
;
int
ho_error
;
int
ho_error
;
...
...
mysql-test/mysql-test-run.pl
View file @
18e17f13
...
@@ -5055,13 +5055,6 @@ sub mysqld_start ($$) {
...
@@ -5055,13 +5055,6 @@ sub mysqld_start ($$) {
$path_vardir_trace
,
$mysqld
->
name
());
$path_vardir_trace
,
$mysqld
->
name
());
}
}
if
(
IS_WINDOWS
)
{
# Trick the server to send output to stderr, with --console
if
(
!
(
grep
(
/^--log-error/
,
@$args
)))
{
mtr_add_arg
(
$args
,
"
--console
");
}
}
# "Dynamic" version of MYSQLD_CMD is reevaluated with each mysqld_start.
# "Dynamic" version of MYSQLD_CMD is reevaluated with each mysqld_start.
# Use it to restart the server at testing a failing server start (e.g
# Use it to restart the server at testing a failing server start (e.g
...
@@ -5524,14 +5517,6 @@ sub start_mysqltest ($) {
...
@@ -5524,14 +5517,6 @@ sub start_mysqltest ($) {
my
$extra_opts
=
get_extra_opts
(
$mysqld
,
$tinfo
);
my
$extra_opts
=
get_extra_opts
(
$mysqld
,
$tinfo
);
mysqld_arguments
(
$mysqld_args
,
$mysqld
,
$extra_opts
);
mysqld_arguments
(
$mysqld_args
,
$mysqld
,
$extra_opts
);
mtr_add_arg
(
$args
,
"
--server-arg=%s
",
$_
)
for
@$mysqld_args
;
mtr_add_arg
(
$args
,
"
--server-arg=%s
",
$_
)
for
@$mysqld_args
;
if
(
IS_WINDOWS
)
{
# Trick the server to send output to stderr, with --console
if
(
!
(
grep
(
/^--server-arg=--log-error/
,
@$args
)))
{
mtr_add_arg
(
$args
,
"
--server-arg=--console
");
}
}
}
}
# ----------------------------------------------------------------------
# ----------------------------------------------------------------------
...
...
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