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
0b8d17aa
Commit
0b8d17aa
authored
Apr 27, 2006
by
jimw@mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge mysql.com:/home/jimw/my/mysql-5.0-19393
into mysql.com:/home/jimw/my/mysql-5.0-clean
parents
46ee4ea0
36155b63
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
5 deletions
+5
-5
mysql-test/mysql-test-run.pl
mysql-test/mysql-test-run.pl
+5
-5
No files found.
mysql-test/mysql-test-run.pl
View file @
0b8d17aa
...
@@ -258,6 +258,7 @@ our $opt_result_ext;
...
@@ -258,6 +258,7 @@ our $opt_result_ext;
our
$opt_skip
;
our
$opt_skip
;
our
$opt_skip_rpl
;
our
$opt_skip_rpl
;
our
$use_slaves
;
our
$opt_skip_test
;
our
$opt_skip_test
;
our
$opt_skip_im
;
our
$opt_skip_im
;
...
@@ -407,16 +408,15 @@ sub main () {
...
@@ -407,16 +408,15 @@ sub main () {
my
$tests
=
collect_test_cases
(
$opt_suite
);
my
$tests
=
collect_test_cases
(
$opt_suite
);
# Turn off NDB and other similar options if no tests use it
# Turn off NDB and other similar options if no tests use it
my
(
$need_ndbcluster
,
$need_im
,
$need_slave
);
my
(
$need_ndbcluster
,
$need_im
);
foreach
my
$test
(
@$tests
)
foreach
my
$test
(
@$tests
)
{
{
$need_ndbcluster
||=
$test
->
{
ndb_test
};
$need_ndbcluster
||=
$test
->
{
ndb_test
};
$need_im
||=
$test
->
{
component_id
}
eq
'
im
';
$need_im
||=
$test
->
{
component_id
}
eq
'
im
';
$
need_slave
||=
$test
->
{
slave_num
};
$
use_slaves
||=
$test
->
{
slave_num
};
}
}
$opt_with_ndbcluster
=
0
unless
$need_ndbcluster
;
$opt_with_ndbcluster
=
0
unless
$need_ndbcluster
;
$opt_skip_im
=
1
unless
$need_im
;
$opt_skip_im
=
1
unless
$need_im
;
$opt_skip_rpl
=
1
unless
$need_slave
;
snapshot_setup
();
snapshot_setup
();
initialize_servers
();
initialize_servers
();
...
@@ -981,7 +981,7 @@ sub snapshot_setup () {
...
@@ -981,7 +981,7 @@ sub snapshot_setup () {
$master
->
[
0
]
->
{'
path_myddir
'},
$master
->
[
0
]
->
{'
path_myddir
'},
$master
->
[
1
]
->
{'
path_myddir
'});
$master
->
[
1
]
->
{'
path_myddir
'});
unless
(
$opt_skip_rpl
)
if
(
$use_slaves
)
{
{
push
@data_dir_lst
,
(
$slave
->
[
0
]
->
{'
path_myddir
'},
push
@data_dir_lst
,
(
$slave
->
[
0
]
->
{'
path_myddir
'},
$slave
->
[
1
]
->
{'
path_myddir
'},
$slave
->
[
1
]
->
{'
path_myddir
'},
...
@@ -1636,7 +1636,7 @@ sub mysql_install_db () {
...
@@ -1636,7 +1636,7 @@ sub mysql_install_db () {
install_db
('
master
',
$master
->
[
0
]
->
{'
path_myddir
'});
install_db
('
master
',
$master
->
[
0
]
->
{'
path_myddir
'});
install_db
('
master
',
$master
->
[
1
]
->
{'
path_myddir
'});
install_db
('
master
',
$master
->
[
1
]
->
{'
path_myddir
'});
if
(
!
$opt_skip_rpl
)
if
(
$use_slaves
)
{
{
install_db
('
slave
',
$slave
->
[
0
]
->
{'
path_myddir
'});
install_db
('
slave
',
$slave
->
[
0
]
->
{'
path_myddir
'});
install_db
('
slave
',
$slave
->
[
1
]
->
{'
path_myddir
'});
install_db
('
slave
',
$slave
->
[
1
]
->
{'
path_myddir
'});
...
...
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