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
fc7fea0c
Commit
fc7fea0c
authored
17 years ago
by
tsmith@quadxeon.mysql.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mysql-test-run.pl:
Run master init scripts also for --embedded-server
parent
b0007916
Branches unavailable
Tags unavailable
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
22 additions
and
11 deletions
+22
-11
mysql-test/mysql-test-run.pl
mysql-test/mysql-test-run.pl
+22
-11
No files found.
mysql-test/mysql-test-run.pl
View file @
fc7fea0c
...
...
@@ -3434,6 +3434,10 @@ sub run_testcase ($) {
return
1
;
}
}
elsif
(
$glob_use_embedded_server
)
{
run_master_init_script
(
$tinfo
);
}
# ----------------------------------------------------------------------
# If --start-and-exit or --start-dirty given, stop here to let user manually
...
...
@@ -3609,6 +3613,23 @@ sub report_failure_and_restart ($) {
}
sub
run_master_init_script
($)
{
my
(
$tinfo
)
=
@_
;
my
$init_script
=
$tinfo
->
{'
master_sh
'};
# Run master initialization shell script if one exists
if
(
$init_script
)
{
my
$ret
=
mtr_run
("
/bin/sh
",
[
$init_script
],
"",
"",
"",
"");
if
(
$ret
!=
0
)
{
# FIXME rewrite those scripts to return 0 if successful
# mtr_warning("$init_script exited with code $ret");
}
}
}
##############################################################################
#
# Start and stop servers
...
...
@@ -3620,7 +3641,6 @@ sub do_before_start_master ($) {
my
(
$tinfo
)
=
@_
;
my
$tname
=
$tinfo
->
{'
name
'};
my
$init_script
=
$tinfo
->
{'
master_sh
'};
# FIXME what about second master.....
...
...
@@ -3636,16 +3656,7 @@ sub do_before_start_master ($) {
unlink
("
$master
->[1]->{'path_myddir'}/master.info
");
unlink
("
$master
->[1]->{'path_myddir'}/relay-log.info
");
# Run master initialization shell script if one exists
if
(
$init_script
)
{
my
$ret
=
mtr_run
("
/bin/sh
",
[
$init_script
],
"",
"",
"",
"");
if
(
$ret
!=
0
)
{
# FIXME rewrite those scripts to return 0 if successful
# mtr_warning("$init_script exited with code $ret");
}
}
run_master_init_script
(
$tinfo
);
}
...
...
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