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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
26576e90
Commit
26576e90
authored
19 years ago
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1
into rurik.mysql.com:/home/igor/mysql-4.1
parents
d9a7e4e0
7ed5026d
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
8 deletions
+8
-8
mysql-test/mysql-test-run.pl
mysql-test/mysql-test-run.pl
+8
-8
No files found.
mysql-test/mysql-test-run.pl
View file @
26576e90
...
@@ -303,7 +303,7 @@ sub mysqld_arguments ($$$$$);
...
@@ -303,7 +303,7 @@ sub mysqld_arguments ($$$$$);
sub
stop_masters_slaves
();
sub
stop_masters_slaves
();
sub
stop_masters
();
sub
stop_masters
();
sub
stop_slaves
();
sub
stop_slaves
();
sub
run_mysqltest
($
$
);
sub
run_mysqltest
($);
sub
usage
($);
sub
usage
($);
######################################################################
######################################################################
...
@@ -1345,10 +1345,11 @@ sub run_testcase ($) {
...
@@ -1345,10 +1345,11 @@ sub run_testcase ($) {
if
(
!
$glob_use_running_server
and
!
$glob_use_embedded_server
)
if
(
!
$glob_use_running_server
and
!
$glob_use_embedded_server
)
{
{
if
(
$tinfo
->
{'
master_restart
'}
or
$master
->
[
0
]
->
{'
uses_special_flags
'}
)
if
(
$tinfo
->
{'
master_restart
'}
or
$master
->
[
0
]
->
{'
running_master_is_special
'}
)
{
{
stop_masters
();
stop_masters
();
$master
->
[
0
]
->
{'
uses_special_flags
'}
=
0
;
# Forget abou
t why we stopped
$master
->
[
0
]
->
{'
running_master_is_special
'}
=
0
;
# Forge
t why we stopped
}
}
# ----------------------------------------------------------------------
# ----------------------------------------------------------------------
...
@@ -1426,9 +1427,9 @@ sub run_testcase ($) {
...
@@ -1426,9 +1427,9 @@ sub run_testcase ($) {
}
}
}
}
if
(
@
{
$tinfo
->
{'
master_opt
'}
}
)
if
(
$tinfo
->
{'
master_restart
'
}
)
{
{
$master
->
[
0
]
->
{'
uses_special_flags
'}
=
1
;
$master
->
[
0
]
->
{'
running_master_is_special
'}
=
1
;
}
}
}
}
...
@@ -1475,7 +1476,7 @@ sub run_testcase ($) {
...
@@ -1475,7 +1476,7 @@ sub run_testcase ($) {
}
}
unlink
(
$path_timefile
);
unlink
(
$path_timefile
);
my
$res
=
run_mysqltest
(
$tinfo
,
$tinfo
->
{'
master_opt
'}
);
my
$res
=
run_mysqltest
(
$tinfo
);
if
(
$res
==
0
)
if
(
$res
==
0
)
{
{
...
@@ -1975,9 +1976,8 @@ sub stop_slaves () {
...
@@ -1975,9 +1976,8 @@ sub stop_slaves () {
}
}
sub
run_mysqltest
($
$
)
{
sub
run_mysqltest
($)
{
my
$tinfo
=
shift
;
my
$tinfo
=
shift
;
my
$master_opts
=
shift
;
my
$cmdline_mysqldump
=
"
$exe_mysqldump
--no-defaults -uroot
"
.
my
$cmdline_mysqldump
=
"
$exe_mysqldump
--no-defaults -uroot
"
.
"
--socket=
$master
->[0]->{'path_mysock'} --password=
";
"
--socket=
$master
->[0]->{'path_mysock'} --password=
";
...
...
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